From 923f77eb07996e280a78ca2825754cf4e9d8bf41 Mon Sep 17 00:00:00 2001 From: 44673626 <44673626@qq.com> Date: Sat, 8 Jan 2022 11:15:51 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E7=BA=A2=E6=97=97202008?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vue/src/router/modules/hq_out_order.js | 64 ++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 vue/src/router/modules/hq_out_order.js diff --git a/vue/src/router/modules/hq_out_order.js b/vue/src/router/modules/hq_out_order.js new file mode 100644 index 00000000..efa9f133 --- /dev/null +++ b/vue/src/router/modules/hq_out_order.js @@ -0,0 +1,64 @@ +//大众-FIS结算-路由 +import Layout from '@/layout' + +const hqOutOrderDataRouter = { + path: '/cpat-order', + component: Layout, + redirect: 'pg', + name: '业务数据', + //hidden: true, + meta: { + //requiresAuth: true, + title: '红旗出库单管理', + index: 0, + type: 'crm', + icon: '单据导入', + keepAlive: false, + }, + children: [ + { + path: 'hq-h-outorder', + component: () => import('@/views/ux/billManage/vwOutOrder/index'), + name: 'SettleAccount',//命名路由 + meta: { + title: '大众准时化出库单', + roles: ['SettleAccount.SettleAccounts'],//控制页面角色（可以设置多个角色） + icon: '结算' + } + }, + { + path: 'hq-m-outorder', + component: () => import('@/views/ux/billManage/kanbanOutOrder/index'), + name: 'SettleAccount',//命名路由 + meta: { + title: '大众看板出库单', + roles: ['SettleAccount.SettleAccounts'],//控制页面角色（可以设置多个角色） + icon: '结算' + } + }, + { + path: 'hq-f-withoutorder', + component: () => import('@/views/ux/billManage/kanbanWithOutOrder/index'), + name: 'SettleAccount',//命名路由 + meta: { + title: '大众无条码看板出库单', + roles: ['SettleAccount.SettleAccounts'],//控制页面角色（可以设置多个角色） + icon: '结算' + } + }, + { + path: 'hq-car-outorder', + component: () => import('@/views/ux/billManage/sparepartOutOrder/index'), + name: 'Invoices',//命名路由 + meta: { + title: '大众备件出库单', + roles: ['SettleAccount.Invoices'], + icon: '对比' + } + }, + + ] +} + +export default hqOutOrderDataRouter + From fffe3b93d49900534588c19de0b23d179ced26eb Mon Sep 17 00:00:00 2001 From: Administrator Date: Sat, 8 Jan 2022 14:20:21 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Logs/log-20220108.txt | 654 ++++++++++++++++++ .../SettleAccount.HttpApi.Host.csproj | 1 + .../Entities/WMS/WMSHQFKanbanAppService.cs | 115 ++- .../WMS/WMSHQFSharePartAppService .cs | 206 +++--- .../Entities/WMS/WMSHQHKanbanAppService.cs | 470 +++++++++++++ .../Entities/WMS/WMSHQHSharePartAppService.cs | 416 +++++++++++ .../Entities/WMS/WMSKanbanAppService.cs | 75 +- .../Entities/WMS/WMSSharePartAppService.cs | 67 +- .../ReportServices/ReportMakeService.cs | 139 +--- .../SettleAccount.Application.xml | 120 ++++ .../Entities/WMS/TaskList.cs | 232 ++++++- .../Entities/WMS/WmsOutPutPercent.cs | 28 + ...AccountDbContextModelCreatingExtensions.cs | 163 +++++ .../HQFSettledDetailDapperRepository.cs | 2 +- .../Report/HQFShippingDapperRepository.cs | 107 +++ .../Report/HQHShippingDapperRepository.cs | 109 +++ .../Report/HQMShippingDapperRepository.cs | 107 +++ .../Report/HQFShippingExportService.cs | 51 ++ .../Report/HQHShippingExportService.cs | 57 ++ ...SharePartSettledDetailDiffExportService.cs | 118 ++++ .../Report/HQMShippingExportService.cs | 51 ++ .../SettleAccount/数据库修改记录.xlsx | Bin 12756 -> 0 bytes 22 files changed, 2877 insertions(+), 411 deletions(-) create mode 100644 src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Logs/log-20220108.txt create mode 100644 src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHKanbanAppService.cs create mode 100644 src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHSharePartAppService.cs create mode 100644 src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/WmsOutPutPercent.cs create mode 100644 src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQFShippingDapperRepository.cs create mode 100644 src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQHShippingDapperRepository.cs create mode 100644 src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQMShippingDapperRepository.cs create mode 100644 src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQFShippingExportService.cs create mode 100644 src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQHShippingExportService.cs create mode 100644 src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQMSharePartSettledDetailDiffExportService.cs create mode 100644 src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQMShippingExportService.cs delete mode 100644 src/Modules/SettleAccount/数据库修改记录.xlsx diff --git a/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Logs/log-20220108.txt b/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Logs/log-20220108.txt new file mode 100644 index 00000000..30bc68b6 --- /dev/null +++ b/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Logs/log-20220108.txt @@ -0,0 +1,654 @@ +2022-01-08 13:59:52.750 G Starting web host. +2022-01-08 14:00:09.268 G User profile is available. Using '"C:\Users\Administrator\AppData\Local\ASP.NET\DataProtection-Keys"' as key repository and Windows DPAPI to encrypt keys at rest. +2022-01-08 14:00:09.331 G Loaded ABP modules: +2022-01-08 14:00:09.333 G - Win.Sfs.SettleAccount.SettleAccountHttpApiHostModule +2022-01-08 14:00:09.333 G - Win.Sfs.SettleAccount.SettleAccountApplicationModule +2022-01-08 14:00:09.334 G - Win.Sfs.SettleAccount.SettleAccountJobModule +2022-01-08 14:00:09.335 G - Win.Sfs.SettleAccount.SettleAccountDomainModule +2022-01-08 14:00:09.335 G - Volo.Abp.Domain.AbpDddDomainModule +2022-01-08 14:00:09.336 G - Volo.Abp.Auditing.AbpAuditingModule +2022-01-08 14:00:09.337 G - Volo.Abp.Data.AbpDataModule +2022-01-08 14:00:09.337 G - Volo.Abp.ObjectExtending.AbpObjectExtendingModule +2022-01-08 14:00:09.337 G - Volo.Abp.Localization.AbpLocalizationAbstractionsModule +2022-01-08 14:00:09.338 G - Volo.Abp.Validation.AbpValidationAbstractionsModule +2022-01-08 14:00:09.338 G - Volo.Abp.Uow.AbpUnitOfWorkModule +2022-01-08 14:00:09.339 G - Volo.Abp.EventBus.Abstractions.AbpEventBusAbstractionsModule +2022-01-08 14:00:09.339 G - Volo.Abp.Json.AbpJsonModule +2022-01-08 14:00:09.340 G - Volo.Abp.Timing.AbpTimingModule +2022-01-08 14:00:09.344 G - Volo.Abp.Localization.AbpLocalizationModule +2022-01-08 14:00:09.344 G - Volo.Abp.VirtualFileSystem.AbpVirtualFileSystemModule +2022-01-08 14:00:09.345 G - Volo.Abp.Settings.AbpSettingsModule +2022-01-08 14:00:09.345 G - Volo.Abp.Security.AbpSecurityModule +2022-01-08 14:00:09.346 G - Volo.Abp.MultiTenancy.AbpMultiTenancyModule +2022-01-08 14:00:09.347 G - Volo.Abp.Threading.AbpThreadingModule +2022-01-08 14:00:09.347 G - Volo.Abp.EventBus.AbpEventBusModule +2022-01-08 14:00:09.348 G - Volo.Abp.Guids.AbpGuidsModule +2022-01-08 14:00:09.348 G - Volo.Abp.ObjectMapping.AbpObjectMappingModule +2022-01-08 14:00:09.349 G - Volo.Abp.ExceptionHandling.AbpExceptionHandlingModule +2022-01-08 14:00:09.350 G - Volo.Abp.Specifications.AbpSpecificationsModule +2022-01-08 14:00:09.350 G - Win.Sfs.SettleAccount.SettleAccountDomainSharedModule +2022-01-08 14:00:09.351 G - Volo.Abp.Validation.AbpValidationModule +2022-01-08 14:00:09.352 G - Win.Sfs.SettleAccount.SettleAccountApplicationContractsModule +2022-01-08 14:00:09.353 G - Volo.Abp.Application.AbpDddApplicationContractsModule +2022-01-08 14:00:09.354 G - Volo.Abp.Authorization.AbpAuthorizationModule +2022-01-08 14:00:09.355 G - Volo.Abp.Authorization.AbpAuthorizationAbstractionsModule +2022-01-08 14:00:09.355 G - Volo.Abp.AutoMapper.AbpAutoMapperModule +2022-01-08 14:00:09.358 G - Volo.Abp.Dapper.AbpDapperModule +2022-01-08 14:00:09.359 G - Volo.Abp.EntityFrameworkCore.AbpEntityFrameworkCoreModule +2022-01-08 14:00:09.361 G - Win.Abp.Snowflakes.AbpSnowflakeGeneratorModule +2022-01-08 14:00:09.361 G - Volo.Abp.Http.Client.IdentityModel.AbpHttpClientIdentityModelModule +2022-01-08 14:00:09.362 G - Volo.Abp.Http.Client.AbpHttpClientModule +2022-01-08 14:00:09.362 G - Volo.Abp.Http.AbpHttpModule +2022-01-08 14:00:09.363 G - Volo.Abp.Http.AbpHttpAbstractionsModule +2022-01-08 14:00:09.364 G - Volo.Abp.Minify.AbpMinifyModule +2022-01-08 14:00:09.364 G - Volo.Abp.Castle.AbpCastleCoreModule +2022-01-08 14:00:09.365 G - Volo.Abp.IdentityModel.AbpIdentityModelModule +2022-01-08 14:00:09.366 G - Volo.Abp.Caching.AbpCachingModule +2022-01-08 14:00:09.366 G - Volo.Abp.Serialization.AbpSerializationModule +2022-01-08 14:00:09.367 G - Volo.Abp.Identity.AbpIdentityHttpApiClientModule +2022-01-08 14:00:09.368 G - Volo.Abp.Identity.AbpIdentityApplicationContractsModule +2022-01-08 14:00:09.368 G - Volo.Abp.Identity.AbpIdentityDomainSharedModule +2022-01-08 14:00:09.369 G - Volo.Abp.Users.AbpUsersDomainSharedModule +2022-01-08 14:00:09.369 G - Volo.Abp.Features.AbpFeaturesModule +2022-01-08 14:00:09.370 G - Volo.Abp.Users.AbpUsersAbstractionModule +2022-01-08 14:00:09.371 G - Volo.Abp.Application.AbpDddApplicationModule +2022-01-08 14:00:09.371 G - Volo.Abp.GlobalFeatures.AbpGlobalFeaturesModule +2022-01-08 14:00:09.374 G - Volo.Abp.PermissionManagement.AbpPermissionManagementApplicationContractsModule +2022-01-08 14:00:09.375 G - Volo.Abp.PermissionManagement.AbpPermissionManagementDomainSharedModule +2022-01-08 14:00:09.375 G - Volo.Abp.AspNetCore.Mvc.AbpAspNetCoreMvcModule +2022-01-08 14:00:09.376 G - Volo.Abp.AspNetCore.AbpAspNetCoreModule +2022-01-08 14:00:09.377 G - Volo.Abp.ApiVersioning.AbpApiVersioningAbstractionsModule +2022-01-08 14:00:09.377 G - Volo.Abp.AspNetCore.Mvc.AbpAspNetCoreMvcContractsModule +2022-01-08 14:00:09.378 G - Volo.Abp.UI.Navigation.AbpUiNavigationModule +2022-01-08 14:00:09.378 G - Volo.Abp.UI.AbpUiModule +2022-01-08 14:00:09.379 G - Win.Sfs.SettleAccount.SettleAccountEntityFrameworkCoreModule +2022-01-08 14:00:09.380 G - Volo.Abp.PermissionManagement.EntityFrameworkCore.AbpPermissionManagementEntityFrameworkCoreModule +2022-01-08 14:00:09.380 G - Volo.Abp.PermissionManagement.AbpPermissionManagementDomainModule +2022-01-08 14:00:09.381 G - Volo.Abp.SettingManagement.EntityFrameworkCore.AbpSettingManagementEntityFrameworkCoreModule +2022-01-08 14:00:09.382 G - Volo.Abp.SettingManagement.AbpSettingManagementDomainModule +2022-01-08 14:00:09.382 G - Volo.Abp.SettingManagement.AbpSettingManagementDomainSharedModule +2022-01-08 14:00:09.383 G - Volo.Abp.AuditLogging.EntityFrameworkCore.AbpAuditLoggingEntityFrameworkCoreModule +2022-01-08 14:00:09.384 G - Volo.Abp.AuditLogging.AbpAuditLoggingDomainModule +2022-01-08 14:00:09.384 G - Volo.Abp.AuditLogging.AbpAuditLoggingDomainSharedModule +2022-01-08 14:00:09.385 G - Volo.Abp.TenantManagement.EntityFrameworkCore.AbpTenantManagementEntityFrameworkCoreModule +2022-01-08 14:00:09.385 G - Volo.Abp.TenantManagement.AbpTenantManagementDomainModule +2022-01-08 14:00:09.386 G - Volo.Abp.TenantManagement.AbpTenantManagementDomainSharedModule +2022-01-08 14:00:09.387 G - Win.Sfs.SettleAccount.SettleAccountHttpApiModule +2022-01-08 14:00:09.387 G - Volo.Abp.Autofac.AbpAutofacModule +2022-01-08 14:00:09.390 G - Volo.Abp.EntityFrameworkCore.SqlServer.AbpEntityFrameworkCoreSqlServerModule +2022-01-08 14:00:09.391 G - Volo.Abp.AspNetCore.Serilog.AbpAspNetCoreSerilogModule +2022-01-08 14:00:09.391 G - Volo.Abp.BlobStoring.AbpBlobStoringModule +2022-01-08 14:00:09.392 G - Volo.Abp.BlobStoring.FileSystem.AbpBlobStoringFileSystemModule +2022-01-08 14:00:09.392 G - Volo.Abp.BackgroundJobs.Hangfire.AbpBackgroundJobsHangfireModule +2022-01-08 14:00:09.393 G - Volo.Abp.BackgroundJobs.AbpBackgroundJobsAbstractionsModule +2022-01-08 14:00:09.394 G - Volo.Abp.Hangfire.AbpHangfireModule +2022-01-08 14:00:09.454 G Start installing Hangfire SQL objects... +2022-01-08 14:00:09.568 G Hangfire SQL objects installed. +2022-01-08 14:00:09.578 G Starting Hangfire Server using job storage: 'SQL Server: 127.0.0.1@SettleAccountService1' +2022-01-08 14:00:09.579 G Using the following options for SQL Server job storage: Queue poll interval: 00:00:15. +2022-01-08 14:00:09.580 G Using the following options for Hangfire Server: + Worker count: 20 + Listening queues: 'default' + Shutdown timeout: 00:00:15 + Schedule polling interval: 00:00:15 +2022-01-08 14:00:09.622 G Starting Hangfire Server using job storage: 'SQL Server: 127.0.0.1@SettleAccountService1' +2022-01-08 14:00:09.624 G Using the following options for SQL Server job storage: Queue poll interval: 00:00:15. +2022-01-08 14:00:09.625 G Using the following options for Hangfire Server: + Worker count: 20 + Listening queues: 'default' + Shutdown timeout: 00:00:15 + Schedule polling interval: 00:00:15 +2022-01-08 14:00:09.808 G Server sk-20210819huao:28832:c46a7026 successfully announced in 200.4138 ms +2022-01-08 14:00:09.808 G Server sk-20210819huao:28832:f28bce65 successfully announced in 171.3692 ms +2022-01-08 14:00:09.819 G Server sk-20210819huao:28832:f28bce65 is starting the registered dispatchers: ServerWatchdog, ServerJobCancellationWatcher, ExpirationManager, CountersAggregator, Worker, DelayedJobScheduler, RecurringJobScheduler... +2022-01-08 14:00:09.819 G Server sk-20210819huao:28832:c46a7026 is starting the registered dispatchers: ServerWatchdog, ServerJobCancellationWatcher, ExpirationManager, CountersAggregator, Worker, DelayedJobScheduler, RecurringJobScheduler... +2022-01-08 14:00:09.857 G 2 servers were removed due to timeout +2022-01-08 14:00:10.009 G Server sk-20210819huao:28832:f28bce65 all the dispatchers started +2022-01-08 14:00:10.029 G Server sk-20210819huao:28832:c46a7026 all the dispatchers started +2022-01-08 14:00:11.127 G Entity Framework Core "5.0.8" initialized '"PermissionManagementDbContext"' using provider '"Microsoft.EntityFrameworkCore.SqlServer"' with options: "QuerySplittingBehavior=SplitQuery " +2022-01-08 14:00:11.416 G Executed DbCommand ("25"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.502 G Executed DbCommand ("2"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.506 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.510 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.515 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.520 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.526 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.530 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.533 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.537 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.544 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.548 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.553 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.559 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.563 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.567 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.573 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.577 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.580 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.584 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.589 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.593 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.597 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.602 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.606 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.610 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.613 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.619 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.623 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.626 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.631 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.638 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.641 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.645 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.651 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.655 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.659 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.662 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.668 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.671 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.675 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.678 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.684 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.687 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.691 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.695 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.700 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.705 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.709 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.716 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.720 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.725 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.733 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.738 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.744 G Executed DbCommand ("2"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.752 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.759 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.768 G Executed DbCommand ("2"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.778 G Executed DbCommand ("2"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.790 G Executed DbCommand ("3"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.797 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.806 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.811 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.816 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.821 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.826 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.830 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.835 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.841 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.845 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.851 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.859 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.864 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.872 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.878 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.884 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.890 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.895 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.901 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.906 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.911 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.919 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.923 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.927 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.932 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.937 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.942 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.946 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.953 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.959 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.965 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.971 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.976 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.983 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.987 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:11.992 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:12.000 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:12.004 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:12.009 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:12.017 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:12.022 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:12.028 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:12.033 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:12.038 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:12.042 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:12.047 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:00:12.337 G Initialized all ABP modules. +2022-01-08 14:00:12.430 G Now listening on: "http://localhost:44378" +2022-01-08 14:00:12.432 G Application started. Press Ctrl+C to shut down. +2022-01-08 14:00:12.433 G Hosting environment: "Development" +2022-01-08 14:00:12.434 G Content root path: "C:\Users\Administrator\source\repos\Win.Sfs.SmartSettlementSystem.PG\src\Modules\SettleAccount\host\SettleAccount.HttpApi.Host" +2022-01-08 14:00:13.328 G Request starting HTTP/1.1 GET http://localhost:44378/ - - +2022-01-08 14:00:14.104 G Executing endpoint '"Win.Sfs.SettleAccount.Controllers.HomeController.Index (SettleAccount.HttpApi.Host)"' +2022-01-08 14:00:14.153 G Route matched with "{action = \"Index\", controller = \"Home\", area = \"\"}". Executing controller action with signature "Microsoft.AspNetCore.Mvc.ActionResult Index()" on controller "Win.Sfs.SettleAccount.Controllers.HomeController" ("SettleAccount.HttpApi.Host"). +2022-01-08 14:00:14.179 G Executing RedirectResult, redirecting to "/swagger". +2022-01-08 14:00:14.185 G Executed action "Win.Sfs.SettleAccount.Controllers.HomeController.Index (SettleAccount.HttpApi.Host)" in 24.6358ms +2022-01-08 14:00:14.187 G Executed endpoint '"Win.Sfs.SettleAccount.Controllers.HomeController.Index (SettleAccount.HttpApi.Host)"' +2022-01-08 14:00:14.199 G Request finished HTTP/1.1 GET http://localhost:44378/ - - - 302 0 - 873.4994ms +2022-01-08 14:00:14.213 G Request starting HTTP/1.1 GET http://localhost:44378/swagger/index.html - - +2022-01-08 14:00:14.262 G Request finished HTTP/1.1 GET http://localhost:44378/swagger/index.html - - - 200 - text/html;charset=utf-8 49.4587ms +2022-01-08 14:00:14.378 G Request starting HTTP/1.1 GET http://localhost:44378/swagger/v1/swagger.json - - +2022-01-08 14:00:15.641 G Request finished HTTP/1.1 GET http://localhost:44378/swagger/v1/swagger.json - - - 200 - application/json;charset=utf-8 1263.7065ms diff --git a/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/SettleAccount.HttpApi.Host.csproj b/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/SettleAccount.HttpApi.Host.csproj index c09813b6..47366b8f 100644 --- a/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/SettleAccount.HttpApi.Host.csproj +++ b/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/SettleAccount.HttpApi.Host.csproj @@ -54,6 +54,7 @@ + diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFKanbanAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFKanbanAppService.cs index 3a316357..0238a40a 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFKanbanAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFKanbanAppService.cs @@ -237,7 +237,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts [Route("WmsHQFKanbanOutPut")] public async Task WmsHQFKanbanOutPut(WmsJitRequestDto input) { - var _billNum = "K" + DateTime.Now.ToString("yyyyMMddhhmmss"); + var _billNum = "HQKB" + DateTime.Now.ToString("yyyyMMddhhmmss"); var _joblist = _job.Where(p => input.Guids.Contains(p.Id) && p.FileName == "已确认").ToList(); if (_joblist.Count() > 0) @@ -251,23 +251,18 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts var _list = _excelHelper.ExcelToList(); foreach (var itm in _list) { - - - - - itm.SetData(GuidGenerator.Create(),string.Empty,!string.IsNullOrEmpty(itm.WmsBillNum)? itm.WmsBillNum:string.Empty,input.Version,GuidGenerator.Create()); } _lst.AddRange(_list.ToArray()); } - // var _ls1 = _lst.Where(p => p.ParentMaterialCode == p.MaterialCode).ToList(); + var outPutDetail = await _wmsRepository.Where(p => p.Version == input.Version).ToListAsync(); var error = from itm1 in outPutDetail join itm2 in _lst on - new { itm1.MaterialCode, itm1.Kanban} + new { itm1.MaterialCode, itm1.Kanban,itm1.PoLine } equals - new { itm2.MaterialCode, itm2.Kanban } + new { itm2.MaterialCode, itm2.Kanban,itm2.PoLine } select itm1; var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Sum(itm => itm.Qty) }); if (errList.Count() == 0) @@ -334,30 +329,20 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts [UnitOfWork(false)] public async Task WmsHQFKanbanOutPutPass(WmsJitRequestDto input) { - if (input.Guids != null) - { - List _ls = new List(); - if (input.Guids.Count() > 0) - { - _ls = await _wmsRepository.Where(p => input.Guids.Contains(p.Id) && p.Version ==input.Version && p.BillNum == input.BillNum && p.State != 2).ToListAsync(); - } - else - { - _ls = await _wmsRepository.Where(p => p.Version == input.Version && p.BillNum == input.BillNum && p.State != 2).ToListAsync(); - } - if (_ls.Count() > 0) - { - var sql = "DECLARE @return_value int\n" + - "EXEC @return_value = [dbo].[p_wms_output]\n" + - " @billnum = N'{0}',\n" + - " @type = 3\n" + - "SELECT 'Return Value' = @return_value"; - await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( - string.Format(sql, input.BillNum)); - - } - } + var sql = "DECLARE @return_value int\n" + + "EXEC @return_value = [dbo].[p_wms_output]\n" + + " @billnum = N'{0}',\n" + + " @type = 3,\n" + + " @date = N'{1}'\n" + + "SELECT 'Return Value' = @return_value"; + await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( + string.Format(sql, input.BillNum, input.AccountDate) + ); + + + return true; + } /// ///出库界面功能， 撤销核准出库 @@ -369,26 +354,32 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts [Route("WmsHQFKanbanOutPut-Cancel")] public async Task WmsHQFKanbanOutPutCancel(WmsJitRequestDto input) { - var _ls = await _wmsRepository.Where(p => input.Guids.Contains(p.Id) && p.Version == input.Version && p.State == 1).ToListAsync(); - var _first = _ls.FirstOrDefault(); - if (_ls.Count()>0) + if (input.Guids != null && input.Guids.Count() > 0) { - var _guid = GuidGenerator.Create(); - await _wmsefRespository.GetDbContext().BulkInsertAsync(_ls,new BulkConfig() { BulkCopyTimeout=0 }); - var uniapi = new TS_UNI_API(GuidGenerator.Create(), "1", input.Version, "WmsHQFKanbanOutPutDetail", _first.BillNum, 0,0, _guid) + List _ls = new List(); + foreach (var itm in input.Guids) { - TaskId = _guid, - SourceBillNum = _first.BillNum, - TableName = "WmsHQFKanbanOutPutDetail", - InterfaceType = "2", - Version = input.Version, - WmsState = 0, - SettleAccountState=0 - }; - var _l = new List(); - _l.Add(uniapi); - await _wmsefRespository.GetDbContext().BulkInsertAsync(_l); + _ls.Add(string.Format("{0}", itm)); + } + + string str = string.Join(",", _ls.ToArray()); + + var sql = "DECLARE @return_value int\n" + + "EXEC @return_value = [dbo].[p_wms_output_cancel]\n" + + " @Guids ={0}, \n" + + " @billnum = N'{1}',\n" + + " @type = 3,\n" + + " @accountdate = N'{2}'\n" + + "SELECT 'Return Value' = @return_value"; + + sql = string.Format(sql, str, input.BillNum, input.AccountDate); + + await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( + sql + ); + } + return true; } [HttpPost] @@ -397,7 +388,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] public async Task ExcelImport([FromForm] IFormFileCollection files, string version) { - var _billNum = "K" + DateTime.Now.ToString("yyyyMMddhhmmss"); + var _billNum = "HQKB" + DateTime.Now.ToString("yyyyMMddhhmmss"); ExportImporter _exportImporter = new ExportImporter(); var result = await _exportImporter.ExtendExcelImport(files, _excelImportService); List _lst = new List(); @@ -408,7 +399,6 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts GuidGenerator.Create(), itm.WmsBillNum, itm.Kanban, - itm.MaterialCode, itm.MaterialDesc, itm.MaterialGroup, @@ -429,15 +419,15 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts } _lst.AddRange(_lsCopy.ToArray()); - var _ls1 = _lst.Where(p => p.ParentMaterialCode == p.MaterialCode).ToList(); + var outPutDetail = await _wmsRepository.Where(p => p.Version == version).ToListAsync(); var error = from itm1 in outPutDetail - join itm2 in _ls1 on - new { itm1.MaterialCode, itm1.Kanban } + join itm2 in _lst on + new { itm1.MaterialCode, itm1.Kanban,itm1.PoLine } equals - new { itm2.MaterialCode, itm2.Kanban } + new { itm2.MaterialCode, itm2.Kanban,itm2.PoLine } select itm1; var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Sum(itm => itm.Qty) }); @@ -452,20 +442,11 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts return await ExportErrorReportAsync(checkList); } - - - - - - - - - - var query = from itm1 in _ls1 + var query = from itm1 in _lst join itm2 in outPutDetail on - new { itm1.MaterialCode, itm1.Kanban } + new { itm1.MaterialCode, itm1.Kanban,itm1.PoLine } equals - new { itm2.MaterialCode, itm2.Kanban } into temp1 + new { itm2.MaterialCode, itm2.Kanban,itm2.PoLine } into temp1 from tm1 in temp1.DefaultIfEmpty() where tm1 == null select itm1; diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFSharePartAppService .cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFSharePartAppService .cs index 3d8f673a..23230b09 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFSharePartAppService .cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFSharePartAppService .cs @@ -213,14 +213,10 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts GuidGenerator.Create(), string.Empty, p.结算数量 - )); _lst.AddRange(_lsAry.ToArray()); } } - - - foreach (var itm in _lst) { itm.BillNum = _billNum; @@ -291,7 +287,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts var sql = "DECLARE @return_value int\n" + "EXEC @return_value = [dbo].[p_wms_output]\n" + " @billnum = N'{0}',\n" + - " @type = 2\n" + + " @type = 4\n" + "SELECT 'Return Value' = @return_value"; await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( string.Format(sql, input.BillNum)); @@ -310,109 +306,111 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts [Route("WmsSharePartOutPut-Cancel")] public async Task WmsSharePartOutPutCancel(WmsJitRequestDto input) { - var _ls = await _wmsRepository.Where(p => input.Guids.Contains(p.Id) && p.Version == input.Version && p.State == 1).ToListAsync(); - var _first = _ls.FirstOrDefault(); - if (_ls.Count() > 0) + if (input.Guids != null && input.Guids.Count() > 0) { - //var _guid = GuidGenerator.Create(); - //await _wmsefRespository.GetDbContext().BulkInsertAsync(_ls,new BulkConfig() { BulkCopyTimeout=0 }); - //var uniapi = new TS_UNI_API(GuidGenerator.Create(), "1", input.Version, "WmsSharePartOutPutDetail", _first.BillNum, 0,0, _guid) - //{ - // TaskId = _guid, - // SourceBillNum = _first.BillNum, - // TableName = "WmsSharePartOutPutDetail", - // InterfaceType = "3", - // Version = input.Version, - // WmsState = 0, - // SettleAccountState=0 - //}; - //var _l = new List(); - //_l.Add(uniapi); - //await _wmsefRespository.GetDbContext().BulkInsertAsync(_l); + List _ls = new List(); + foreach (var itm in input.Guids) + { + _ls.Add(string.Format("{0}", itm)); + } + string str = string.Join(",", _ls.ToArray()); + + var sql = "DECLARE @return_value int\n" + + "EXEC @return_value = [dbo].[p_wms_output_cancel]\n" + + " @Guids ={0}, \n" + + " @billnum = N'{1}',\n" + + " @type = 4,\n" + + " @accountdate = N'{2}'\n" + + "SELECT 'Return Value' = @return_value"; + + sql = string.Format(sql, str, input.BillNum, input.AccountDate); + + await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( + sql + ); } return true; } - //[HttpPost] - //[Route("ExcelImport")] - //[DisableRequestSizeLimit] - ////[Authorize(SettleAccountPermissions.SettleAccounts.Default)] - //public async Task ExcelImport([FromForm] IFormFileCollection files, string version) - //{ - //var _billNum = "BHQ" + DateTime.Now.ToString("yyyyMMddhhmmss"); - //ExportImporter _exportImporter = new ExportImporter(); - //var result = await _exportImporter.ExtendExcelImport(files, _excelImportService); - //List _lst = new List(); - - - - //var _lsCopy = new List(); - //foreach (var itm in result) - //{ - // WmsHQFSharePartOutPutDetial _detail = new WmsHQFSharePartOutPutDetial( - // GuidGenerator.Create(), - // itm.WmsBillNum, - // itm.OrderBillNum, - // itm.MaterialCode, - // itm.MaterialDesc, - // itm.MaterialGroup, - // string.Empty, - // string.Empty, - // 0, - // string.Empty, - // string.Empty, - // version, - // itm.ParentMaterialCode, - // itm.BillNum, - // GuidGenerator.Create() - // , string.Empty - // , itm.Qty - - // ); - // _lsCopy.Add(_detail); - //} - //_lst.AddRange(_lsCopy.ToArray()); - - - //var outPutDetail = await _wmsRepository.Where(p => p.Version == version).ToListAsync(); - - //var error = from itm1 in outPutDetail - // join itm2 in _lst on - // new { itm1.MaterialCode, itm1.OrderBillNum,itm1.WmsBillNum,itm1.po } - // equals - // new { itm2.MaterialCode, itm2.OrderBillNum } - // select itm1; - //var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Sum(itm => itm.Qty) }); - - //var checkList = new List(); - //foreach (var itm in errList) - //{ - // checkList.Add(new ErrorExportDto() { Message = string.Format("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number) }); - //} - //if (checkList.Count > 0) - //{ - // return await ExportErrorReportAsync(checkList); - //} - //var query = from itm1 in _ls1 - // join itm2 in outPutDetail on - // new { itm1.MaterialCode, itm1.OrderBillNum } - // equals - // new { itm2.MaterialCode, itm2.OrderBillNum } into temp1 - // from tm1 in temp1.DefaultIfEmpty() - // where tm1 == null - // select itm1; - //var _wmslst = query.ToList(); - //foreach (var itm in _wmslst) - //{ - // itm.BillNum = _billNum; - //} - //await _wmsRepository.GetDbContext().BulkInsertAsync(_wmslst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 }); - //int _count = _wmsVersionRepository.Count(p => p.Version == version && p.BillNum == _billNum); - //if (_count == 0) - //{ - // var _version = new WmsHQFSharePartOutPut(GuidGenerator.Create(), version, _billNum, CurrentUser.Email); - // await _wmsVersionRepository.InsertAsync(_version, true); - //} - //return _billNum; + [HttpPost] + [Route("ExcelImport")] + [DisableRequestSizeLimit] + //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] + public async Task ExcelImport([FromForm] IFormFileCollection files, string version) + { + var _billNum = "BHQ" + DateTime.Now.ToString("yyyyMMddhhmmss"); + ExportImporter _exportImporter = new ExportImporter(); + var result = await _exportImporter.ExtendExcelImport(files, _excelImportService); + List _lst = new List(); + + var _lsCopy = new List(); + foreach (var itm in result) + { + WmsHQFSharePartOutPutDetial _detail = new WmsHQFSharePartOutPutDetial( + GuidGenerator.Create(), + itm.WmsBillNum, + itm.OrderBillNum, + itm.MaterialCode, + itm.MaterialDesc, + itm.MaterialGroup, + string.Empty, + string.Empty, + 0, + string.Empty, + string.Empty, + version, + itm.ParentMaterialCode, + itm.BillNum, + GuidGenerator.Create() + , string.Empty + , itm.Qty + + ); + _lsCopy.Add(_detail); + } + _lst.AddRange(_lsCopy.ToArray()); + + + var outPutDetail = await _wmsRepository.Where(p => p.Version == version).ToListAsync(); + + var error = from itm1 in outPutDetail + join itm2 in _lst on + new { itm1.MaterialCode, itm1.OrderBillNum } + equals + new { itm2.MaterialCode, itm2.OrderBillNum } + select itm1; + var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Sum(itm => itm.Qty) }); + + var checkList = new List(); + foreach (var itm in errList) + { + checkList.Add(new ErrorExportDto() { Message = string.Format("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number) }); + } + if (checkList.Count > 0) + { + return await ExportErrorReportAsync(checkList); + } + var query = from itm1 in _lst + join itm2 in outPutDetail on + new { itm1.MaterialCode, itm1.OrderBillNum } + equals + new { itm2.MaterialCode, itm2.OrderBillNum } into temp1 + from tm1 in temp1.DefaultIfEmpty() + where tm1 == null + select itm1; + var _wmslst = query.ToList(); + foreach (var itm in _wmslst) + { + itm.BillNum = _billNum; + } + await _wmsRepository.GetDbContext().BulkInsertAsync(_wmslst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 }); + int _count = _wmsVersionRepository.Count(p => p.Version == version && p.BillNum == _billNum); + if (_count == 0) + { + var _version = new WmsHQFSharePartOutPut(GuidGenerator.Create(), version, _billNum, CurrentUser.Email); + await _wmsVersionRepository.InsertAsync(_version, true); + } + return _billNum; + } } } diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHKanbanAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHKanbanAppService.cs new file mode 100644 index 00000000..20fc2a43 --- /dev/null +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHKanbanAppService.cs @@ -0,0 +1,470 @@ +using System; +using System.Collections.Generic; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.Caching.Distributed; +using AutoMapper; +using System.Linq; +using System.Text; +using Volo.Abp.Guids; +using Volo.Abp.Application.Services; +using Volo.Abp.Caching; + +using Volo.Abp.ObjectMapping; +using Win.Sfs.SettleAccount.ExcelImporter; +using Win.Sfs.Shared.CacheBase; +using Win.Utils; +using Volo.Abp.Application.Dtos; +using Win.Sfs.BaseData.ImportExcelCommon; +using Volo.Abp.Domain.Repositories; +using EFCore.BulkExtensions; +using System.IO; +using Microsoft.EntityFrameworkCore; +using Win.Sfs.SettleAccount.Entities.SettleAccountVersion; +using Win.Sfs.SettleAccount.FISes; +using Win.Sfs.Shared.Enums.SettleAccount; +using Win.Sfs.Shared.Filter; +using Shouldly; +using Magicodes.ExporterAndImporter.Csv; +using Magicodes.ExporterAndImporter.Core; +using Magicodes.ExporterAndImporter.Excel; +using System.Data.Common; +using Volo.Abp.Uow; +using Volo.Abp; +using Win.Abp.Snowflakes; +using Win.Sfs.SettleAccount.CommonManagers; +using Win.Sfs.SettleAccount.ExportReports; +using Win.Sfs.SettleAccount.Constant; +using Win.Sfs.SettleAccount.MaterialRelationships; +using Win.Sfs.SettleAccount.Entities.TaskJobs; +using Magicodes.ExporterAndImporter.Core.Models; + +using TaskJob.Services; +using TaskJob.EventArgs; +using Win.Sfs.SettleAccount.Entities.WMS; +using Win.Sfs.SettleAccount.Entities.Wms; +using Win.Sfs.SettleAccount.Repository; +using WY.NewJit.Extends.PaiGe.WMS; +using Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report; + +namespace Win.Sfs.SettleAccount.Entities.SettleAccounts +{ + /// + /// wms出库 + /// + + [AllowAnonymous] + [Route("api/settleaccount/WmsHQHKanbanoutput")] + public class WmsHQHKanbanAppService : + SettleAccountApplicationBase + { + + private readonly ISettleAccountBranchEfCoreRepository _wmsRepository; + private readonly ISettleAccountBranchEfCoreRepository _wmsVersionRepository; + private readonly WMSEfCoreRepository _wmsefRespository; + + private readonly WMSEfCoreRepository _wmstbRespository; + private readonly ISettleAccountBranchEfCoreRepository _job; + private readonly IExcelImportAppService _excelImportService; + + + private readonly TaskJobService _service; + /// + /// + /// + /// + /// + /// + /// + /// + public WmsHQHKanbanAppService( + + + IExcelImportAppService excelImportService, + + ISettleAccountBranchEfCoreRepository wmsRepository, + ISettleAccountBranchEfCoreRepository job, + ISettleAccountBranchEfCoreRepository wmsVersionRepository, + WMSEfCoreRepository wmsefRespository, + WMSEfCoreRepository wmstbRespository, + IDistributedCache cache, + ISnowflakeIdGenerator snowflakeIdGenerator, + ICommonManager commonManager + ) : base(cache, excelImportService, snowflakeIdGenerator, commonManager) + { + _job = job; + _wmstbRespository = wmstbRespository; + _wmsRepository = wmsRepository; + _wmsVersionRepository = wmsVersionRepository; + _wmsefRespository = wmsefRespository; + _excelImportService = excelImportService; + } + + private async Task GetCountAsync(WmsKanbanOutPutDetialRequestDto input) + { + return await _wmsRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters); + } + + private async Task GetCountAsync(WmsKanbanOutPutRequestDto input) + { + return await _wmsVersionRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters); + } + + /// + /// 准时化出库主表 + /// + /// + /// + [HttpPost] + [Route("WmsHQHKanbanList")] + //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] + virtual public async Task> GetListAsync( WmsKanbanOutPutRequestDto input) + { + + var entities = await _wmsVersionRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount, + input.SkipCount, true); + + var totalCount = await GetCountAsync(input); + + + return new PagedResultDto(totalCount, entities); + } + + /// + /// 准时化出库明细 + /// + /// + /// + [HttpPost] + [Route("WmsHQHKanbanDetailList")] + //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] + virtual public async Task> GetListAsync(WmsKanbanOutPutDetialRequestDto input) + { + var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount, + input.SkipCount, true); + + var totalCount = await GetCountAsync(input); + return new PagedResultDto(totalCount, entities); + } + /// + /// 任务明细标记已确认 + /// + /// 上传的文件(前端已经限制只能上传一个附件) + /// + [HttpPost] + [Route("WmsHQHKanbanOutPutAudit")] + [DisableRequestSizeLimit] + + public async Task WmsHQHKanbanAudit(List ids) + { + var _joblist =await _job.Where(p => ids.Contains(p.Id)).ToListAsync(); + foreach (var itm in _joblist) + { + itm.FileName = "已确认"; + await _job.UpdateAsync(itm); + } + + return true; + } + + ///// + ///// 选择任务，生成出库单，只包含已确认的单据 + ///// + ///// + ///// + ///// + //[HttpPost] + //[Route("WmsWithOutKanbanOutPut")] + //public async Task WmsWithOutKanbanOutPut(WmsJitRequestDto input) + //{ + // var _billNum = "KA" + DateTime.Now.ToString("yyyyMMddhhmmss"); + + // var _joblist = _job.Where(p => input.Guids.Contains(p.Id) && p.FileName == "已确认").ToList(); + // if (_joblist.Count() > 0) + // { + // var fileList = _joblist.Select(p => p.RealDownFileName).ToList(); + // List _lst = new List(); + // foreach (var filename in fileList) + // { + // string fileSavePath = Environment.CurrentDirectory + @"\wwwroot\files\host\my-file-container\" + filename; + // ExcelHelper _excelHelper = new ExcelHelper(fileSavePath); + // var _list = _excelHelper.ExcelToList(); + // foreach (var itm in _list) + // { + + // var _entity= new WmsHQHKanbanOutPutDetial(GuidGenerator.Create(), string.Empty, string.Empty, itm.MaterialCode, itm.MaterialDesc + // , itm.SapMaterialGroup, string.Empty, string.Empty, 0, string.Empty, string.Empty, itm.Version, itm.SapMaterialCode, + // _billNum, Guid.Empty, string.Empty, itm.InvoiceQty,itm. + // ); + + // _lst.Add(_entity); + // } + + // } + + // var outPutDetail = await _wmsRepository.Where(p => p.Version == input.Version && p.Kanban==string.Empty).ToListAsync(); + + + // await _wmsRepository.GetDbContext().BulkInsertAsync(_lst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 }); + // int _count = _wmsVersionRepository.Count(p => p.Version == input.Version && p.BillNum == _billNum); + // if (_count == 0) + // { + // var _version = new WmsHQHKanbanOutPut(GuidGenerator.Create(), input.Version, _billNum, CurrentUser.Email); + + // await _wmsVersionRepository.InsertAsync(_version, true); + // } + + // foreach (var job in _joblist) + // { + // job.FileName = _billNum; + // await _job.UpdateAsync(job); + // } + // } + + // return ApplicationConsts.SuccessStr; ; + //} + + + /// + /// 选择任务，生成出库单，只包含已确认的单据 + /// + /// + /// + /// + [HttpPost] + [Route("WmsHQHKanbanOutPut")] + public async Task WmsHQHKanbanOutPut(WmsJitRequestDto input) + { + var _billNum = "HQKB" + DateTime.Now.ToString("yyyyMMddhhmmss"); + + var _joblist = _job.Where(p => input.Guids.Contains(p.Id) && p.FileName == "已确认").ToList(); + if (_joblist.Count() > 0) + { + var fileList = _joblist.Select(p => p.RealDownFileName).ToList(); + List _lst = new List(); + foreach (var filename in fileList) + { + string fileSavePath = Environment.CurrentDirectory + @"\wwwroot\files\host\my-file-container\" + filename; + ExcelHelper _excelHelper = new ExcelHelper(fileSavePath); + var _list = _excelHelper.ExcelToList(); + foreach (var itm in _list) + { + itm.SetData(GuidGenerator.Create(),string.Empty,!string.IsNullOrEmpty(itm.WmsBillNum)? itm.WmsBillNum:string.Empty,input.Version,GuidGenerator.Create()); + } + _lst.AddRange(_list.ToArray()); + } + + var outPutDetail = await _wmsRepository.Where(p => p.Version == input.Version).ToListAsync(); + + var error = from itm1 in outPutDetail + join itm2 in _lst on + new { itm1.MaterialCode, itm1.Kanban,itm1.PoLine } + equals + new { itm2.MaterialCode, itm2.Kanban,itm2.PoLine } + select itm1; + var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Sum(itm => itm.Qty) }); + if (errList.Count() == 0) + { + + var query = from itm1 in _lst + join itm2 in outPutDetail on + new { itm1.MaterialCode, itm1.Kanban } + equals + new { itm2.MaterialCode, itm2.Kanban } into temp1 + from tm1 in temp1.DefaultIfEmpty() + where tm1 == null + select itm1; + var _wmslst = query.ToList(); + foreach (var itm in _wmslst) + { + itm.BillNum = _billNum; + } + await _wmsRepository.GetDbContext().BulkInsertAsync(_wmslst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 }); + int _count = _wmsVersionRepository.Count(p => p.Version == input.Version && p.BillNum == _billNum); + if (_count == 0) + { + var _version = new WmsHQHKanbanOutPut(GuidGenerator.Create(), input.Version, _billNum, CurrentUser.Email); + + await _wmsVersionRepository.InsertAsync(_version, true); + } + + foreach (var job in _joblist) + { + job.FileName = _billNum; + await _job.UpdateAsync(job); + } + } + else + { + StringBuilder _buffer = new StringBuilder(); + foreach (var itm in errList) + { + _buffer.AppendFormat("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number); + } + var _errinfo = _buffer.ToString(); + + foreach (var job in _joblist) + { + job.FileName = _errinfo; + await _job.UpdateAsync(job); + } + } + } + else + { + _billNum = string.Empty; + } + return ApplicationConsts.SuccessStr; ; + } + /// + /// 出库界面功能，核准出库功能 + /// + /// + /// + /// + [HttpPost] + [Route("WmsHQHKanbanOutPut-Pass")] + [UnitOfWork(false)] + public async Task WmsHQHKanbanOutPutPass(WmsJitRequestDto input) + { + var sql = "DECLARE @return_value int\n" + + "EXEC @return_value = [dbo].[p_wms_output]\n" + + " @billnum = N'{0}',\n" + + " @type = 3,\n" + + " @date = N'{1}'\n" + + "SELECT 'Return Value' = @return_value"; + await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( + string.Format(sql, input.BillNum, input.AccountDate) + ); + + + + return true; + + } + /// + ///出库界面功能， 撤销核准出库 + /// + /// + /// + /// + [HttpPost] + [Route("WmsHQHKanbanOutPut-Cancel")] + public async Task WmsHQHKanbanOutPutCancel(WmsJitRequestDto input) + { + if (input.Guids != null && input.Guids.Count() > 0) + { + List _ls = new List(); + foreach (var itm in input.Guids) + { + _ls.Add(string.Format("{0}", itm)); + } + + string str = string.Join(",", _ls.ToArray()); + + var sql = "DECLARE @return_value int\n" + + "EXEC @return_value = [dbo].[p_wms_output_cancel]\n" + + " @Guids ={0}, \n" + + " @billnum = N'{1}',\n" + + " @type = 3,\n" + + " @accountdate = N'{2}'\n" + + "SELECT 'Return Value' = @return_value"; + + sql = string.Format(sql, str, input.BillNum, input.AccountDate); + + await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( + sql + ); + + } + + return true; + } + [HttpPost] + [Route("ExcelImport")] + [DisableRequestSizeLimit] + //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] + public async Task ExcelImport([FromForm] IFormFileCollection files, string version) + { + var _billNum = "HQKB" + DateTime.Now.ToString("yyyyMMddhhmmss"); + ExportImporter _exportImporter = new ExportImporter(); + var result = await _exportImporter.ExtendExcelImport(files, _excelImportService); + List _lst = new List(); + var _lsCopy = new List(); + foreach (var itm in result) + { + WmsHQHKanbanOutPutDetial _detail = new WmsHQHKanbanOutPutDetial( + GuidGenerator.Create(), + itm.WmsBillNum, + itm.Kanban, + itm.MaterialCode, + itm.MaterialDesc, + itm.MaterialGroup, + string.Empty, + string.Empty, + 0, + string.Empty, + string.Empty, + version, + itm.ParentMaterialCode, + itm.BillNum, + GuidGenerator.Create() + , string.Empty + , itm.Qty, + itm.PoLine + ); + _lsCopy.Add(_detail); + } + _lst.AddRange(_lsCopy.ToArray()); + + + var outPutDetail = await _wmsRepository.Where(p => p.Version == version).ToListAsync(); + + + var error = from itm1 in outPutDetail + join itm2 in _lst on + new { itm1.MaterialCode, itm1.Kanban,itm1.PoLine } + equals + new { itm2.MaterialCode, itm2.Kanban,itm2.PoLine } + select itm1; + var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Sum(itm => itm.Qty) }); + + var checkList = new List(); + foreach (var itm in errList) + { + checkList.Add(new ErrorExportDto() { Message = string.Format("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number) }); + } + if (checkList.Count > 0) + { + + return await ExportErrorReportAsync(checkList); + } + + var query = from itm1 in _lst + join itm2 in outPutDetail on + new { itm1.MaterialCode, itm1.Kanban,itm1.PoLine } + equals + new { itm2.MaterialCode, itm2.Kanban,itm2.PoLine } into temp1 + from tm1 in temp1.DefaultIfEmpty() + where tm1 == null + select itm1; + var _wmslst = query.ToList(); + foreach (var itm in _wmslst) + { + itm.BillNum = _billNum; + } + await _wmsRepository.GetDbContext().BulkInsertAsync(_wmslst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 }); + int _count = _wmsVersionRepository.Count(p => p.Version == version && p.BillNum == _billNum); + if (_count == 0) + { + var _version = new WmsHQHKanbanOutPut(GuidGenerator.Create(), version, _billNum, CurrentUser.Email); + await _wmsVersionRepository.InsertAsync(_version, true); + } + return _billNum; + } + + + } +} \ No newline at end of file diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHSharePartAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHSharePartAppService.cs new file mode 100644 index 00000000..b6cb06fe --- /dev/null +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHSharePartAppService.cs @@ -0,0 +1,416 @@ +using System; +using System.Collections.Generic; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.Caching.Distributed; +using AutoMapper; +using System.Linq; +using System.Text; +using Volo.Abp.Guids; +using Volo.Abp.Application.Services; +using Volo.Abp.Caching; + +using Volo.Abp.ObjectMapping; +using Win.Sfs.SettleAccount.ExcelImporter; +using Win.Sfs.Shared.CacheBase; +using Win.Utils; +using Volo.Abp.Application.Dtos; +using Win.Sfs.BaseData.ImportExcelCommon; +using Volo.Abp.Domain.Repositories; +using EFCore.BulkExtensions; +using System.IO; +using Microsoft.EntityFrameworkCore; +using Win.Sfs.SettleAccount.Entities.SettleAccountVersion; +using Win.Sfs.SettleAccount.FISes; +using Win.Sfs.Shared.Enums.SettleAccount; +using Win.Sfs.Shared.Filter; +using Shouldly; +using Magicodes.ExporterAndImporter.Csv; +using Magicodes.ExporterAndImporter.Core; +using Magicodes.ExporterAndImporter.Excel; +using System.Data.Common; +using Volo.Abp.Uow; +using Volo.Abp; +using Win.Abp.Snowflakes; +using Win.Sfs.SettleAccount.CommonManagers; +using Win.Sfs.SettleAccount.ExportReports; +using Win.Sfs.SettleAccount.Constant; +using Win.Sfs.SettleAccount.MaterialRelationships; +using Win.Sfs.SettleAccount.Entities.TaskJobs; +using Magicodes.ExporterAndImporter.Core.Models; + +using TaskJob.Services; +using TaskJob.EventArgs; +using Win.Sfs.SettleAccount.Entities.WMS; +using Win.Sfs.SettleAccount.Entities.Wms; +using Win.Sfs.SettleAccount.Repository; +using WY.NewJit.Extends.PaiGe.WMS; +using Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report; + +namespace Win.Sfs.SettleAccount.Entities.SettleAccounts +{ + /// + /// wms出库 + /// + + [AllowAnonymous] + [Route("api/settleaccount/WmsHQHSharePartoutput")] + public class WmsHQHSharePartAppService : + SettleAccountApplicationBase + { + private readonly ISettleAccountBranchEfCoreRepository _wmsRepository; + private readonly ISettleAccountBranchEfCoreRepository _wmsVersionRepository; + private readonly WMSEfCoreRepository _wmsefRespository; + + private readonly WMSEfCoreRepository _wmstbRespository; + private readonly ISettleAccountBranchEfCoreRepository _job; + private readonly IExcelImportAppService _excelImportService; + + private readonly TaskJobService _service; + /// + /// + /// + /// + /// + /// + /// + /// + public WmsHQHSharePartAppService( + + ISettleAccountBranchEfCoreRepository wmsRepository, + ISettleAccountBranchEfCoreRepository job, + ISettleAccountBranchEfCoreRepository wmsVersionRepository, + WMSEfCoreRepository wmsefRespository, + WMSEfCoreRepository wmstbRespository, + IExcelImportAppService excelImportService, + IDistributedCache cache, + ISnowflakeIdGenerator snowflakeIdGenerator, + ICommonManager commonManager + ) : base(cache, excelImportService, snowflakeIdGenerator, commonManager) + { + _excelImportService = excelImportService; + _job = job; + _wmstbRespository = wmstbRespository; + _wmsRepository = wmsRepository; + _wmsVersionRepository = wmsVersionRepository; + _wmsefRespository = wmsefRespository; + } + + private async Task GetCountAsync(WmsSharePartOutPutDetialRequestDto input) + { + return await _wmsRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters); + } + + private async Task GetCountAsync(WmsSharePartOutPutRequestDto input) + { + return await _wmsVersionRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters); + } + + /// + /// 准时化出库主表 + /// + /// + /// + [HttpPost] + [Route("WmsSharePartList")] + //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] + virtual public async Task> GetListAsync(WmsSharePartOutPutRequestDto input) + { + + var entities = await _wmsVersionRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount, + input.SkipCount, true); + + var totalCount = await GetCountAsync(input); + + + return new PagedResultDto(totalCount, entities); + } + + /// + /// 准时化出库明细 + /// + /// + /// + [HttpPost] + [Route("WmsSharePartDetailList")] + //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] + virtual public async Task> GetListAsync(WmsSharePartOutPutDetialRequestDto input) + { + var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount, + input.SkipCount, true); + + var totalCount = await GetCountAsync(input); + return new PagedResultDto(totalCount, entities); + } + /// + /// 任务明细标记已确认 + /// + /// 上传的文件(前端已经限制只能上传一个附件) + /// + [HttpPost] + [Route("WmsSharePartOutPutAudit")] + [DisableRequestSizeLimit] + + public async Task WmsSharePartAudit(List ids) + { + var _joblist = await _job.Where(p => ids.Contains(p.Id)).ToListAsync(); + foreach (var itm in _joblist) + { + itm.FileName = "已确认"; + } + foreach (var itm in _joblist) + { + await _job.UpdateAsync(itm); + } + var _count = await _job.BatchUpdateAsync(_joblist.ToList()); + if (_count > 0) + { + return true; + } + return false; + } + /// + /// 选择任务，生成出库单，只包含已确认的单据 + /// + /// + /// + /// + [HttpPost] + [Route("WmsSharePartOutPut")] + public async Task WmsSharePartOutPut(WmsJitRequestDto input) + { + var _billNum = "BHQ" + DateTime.Now.ToString("yyyyMMddhhmmss"); + var _joblist = _job.Where(p => input.Guids.Contains(p.Id) && p.FileName == "已确认").ToList(); + if (_joblist.Count() > 0) + { + var fileList = _joblist.Select(p => p.RealDownFileName).ToList(); + List _lst = new List(); + foreach (var filename in fileList) + { + string fileSavePath = Environment.CurrentDirectory + @"\wwwroot\files\host\my-file-container\" + filename; + ExcelHelper _excelHelper = new ExcelHelper(fileSavePath); + var _list = _excelHelper.ExcelToList(); + if (_list.Count() > 0) + { + var _lsAry = _list.Select(p => new + WmsHQHSharePartOutPutDetial( + GuidGenerator.Create(), + "", + string.Empty, + p.结算物料号, + p.物料描述, + p.物料组, + string.Empty, + string.Empty, + 0, + string.Empty, + string.Empty, + input.Version, + p.Sap编码, + _billNum, + GuidGenerator.Create(), + string.Empty, + p.结算数量 + )); + _lst.AddRange(_lsAry.ToArray()); + } + } + foreach (var itm in _lst) + { + itm.BillNum = _billNum; + } + await _wmsRepository.GetDbContext().BulkInsertAsync(_lst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 }); + int _count = _wmsVersionRepository.Count(p => p.Version == input.Version && p.BillNum == _billNum); + if (_count == 0) + { + var _version = new WmsHQHSharePartOutPut(GuidGenerator.Create(), input.Version, _billNum, CurrentUser.Email); + + await _wmsVersionRepository.InsertAsync(_version, true); + + } + + foreach (var job in _joblist) + { + job.FileName = _billNum; + await _job.UpdateAsync(job); + } + } + //return _billNum; + //else + //{ + // StringBuilder _buffer = new StringBuilder(); + // foreach (var itm in errList) + // { + // _buffer.AppendFormat("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number); + // } + // var _errinfo = _buffer.ToString(); + // foreach (var job in _joblist) + // { + // job.FileName = _errinfo; + // await _job.UpdateAsync(job); + // } + + // //} + //} + //else + //{ + // _billNum = string.Empty; + //} + return ApplicationConsts.SuccessStr; + } + /// + /// 出库界面功能，核准出库功能 + /// + /// + /// + /// + [HttpPost] + [Route("WmsSharePartOutPut-Pass")] + [UnitOfWork(false)] + public async Task WmsSharePartOutPutPass(WmsJitRequestDto input) + { + if (input.Guids != null) + { + List _ls = new List(); + if (input.Guids.Count() > 0) + { + _ls = await _wmsRepository.Where(p => input.Guids.Contains(p.Id) && p.Version == input.Version && p.BillNum == input.BillNum && p.State != 2).ToListAsync(); + } + else + { + _ls = await _wmsRepository.Where(p => p.Version == input.Version && p.BillNum == input.BillNum && p.State != 2).ToListAsync(); + } + if (_ls.Count() > 0) + { + var sql = "DECLARE @return_value int\n" + + "EXEC @return_value = [dbo].[p_wms_output]\n" + + " @billnum = N'{0}',\n" + + " @type = 4\n" + + "SELECT 'Return Value' = @return_value"; + await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( + string.Format(sql, input.BillNum)); + + } + } + return true; + } + /// + ///出库界面功能， 撤销核准出库 + /// + /// + /// + /// + [HttpPost] + [Route("WmsSharePartOutPut-Cancel")] + public async Task WmsSharePartOutPutCancel(WmsJitRequestDto input) + { + if (input.Guids != null && input.Guids.Count() > 0) + { + List _ls = new List(); + foreach (var itm in input.Guids) + { + _ls.Add(string.Format("{0}", itm)); + } + string str = string.Join(",", _ls.ToArray()); + + var sql = "DECLARE @return_value int\n" + + "EXEC @return_value = [dbo].[p_wms_output_cancel]\n" + + " @Guids ={0}, \n" + + " @billnum = N'{1}',\n" + + " @type = 4,\n" + + " @accountdate = N'{2}'\n" + + "SELECT 'Return Value' = @return_value"; + + sql = string.Format(sql, str, input.BillNum, input.AccountDate); + + await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( + sql + ); + } + return true; + } + [HttpPost] + [Route("ExcelImport")] + [DisableRequestSizeLimit] + //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] + public async Task ExcelImport([FromForm] IFormFileCollection files, string version) + { + var _billNum = "BHQ" + DateTime.Now.ToString("yyyyMMddhhmmss"); + ExportImporter _exportImporter = new ExportImporter(); + var result = await _exportImporter.ExtendExcelImport(files, _excelImportService); + List _lst = new List(); + + var _lsCopy = new List(); + foreach (var itm in result) + { + WmsHQHSharePartOutPutDetial _detail = new WmsHQHSharePartOutPutDetial( + GuidGenerator.Create(), + itm.WmsBillNum, + itm.OrderBillNum, + itm.MaterialCode, + itm.MaterialDesc, + itm.MaterialGroup, + string.Empty, + string.Empty, + 0, + string.Empty, + string.Empty, + version, + itm.ParentMaterialCode, + itm.BillNum, + GuidGenerator.Create() + , string.Empty + , itm.Qty + + ); + _lsCopy.Add(_detail); + } + _lst.AddRange(_lsCopy.ToArray()); + + + var outPutDetail = await _wmsRepository.Where(p => p.Version == version).ToListAsync(); + + var error = from itm1 in outPutDetail + join itm2 in _lst on + new { itm1.MaterialCode, itm1.OrderBillNum } + equals + new { itm2.MaterialCode, itm2.OrderBillNum } + select itm1; + var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Sum(itm => itm.Qty) }); + + var checkList = new List(); + foreach (var itm in errList) + { + checkList.Add(new ErrorExportDto() { Message = string.Format("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number) }); + } + if (checkList.Count > 0) + { + return await ExportErrorReportAsync(checkList); + } + var query = from itm1 in _lst + join itm2 in outPutDetail on + new { itm1.MaterialCode, itm1.OrderBillNum } + equals + new { itm2.MaterialCode, itm2.OrderBillNum } into temp1 + from tm1 in temp1.DefaultIfEmpty() + where tm1 == null + select itm1; + var _wmslst = query.ToList(); + foreach (var itm in _wmslst) + { + itm.BillNum = _billNum; + } + await _wmsRepository.GetDbContext().BulkInsertAsync(_wmslst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 }); + int _count = _wmsVersionRepository.Count(p => p.Version == version && p.BillNum == _billNum); + if (_count == 0) + { + var _version = new WmsHQHSharePartOutPut(GuidGenerator.Create(), version, _billNum, CurrentUser.Email); + await _wmsVersionRepository.InsertAsync(_version, true); + } + return _billNum; + } + } + +} diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanAppService.cs index 9a41c23c..961e41ca 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanAppService.cs @@ -395,26 +395,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts "SELECT 'Return Value' = @return_value"; await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( string.Format(sql, input.BillNum)); - //var _first = _ls.FirstOrDefault(); - //var _guid = GuidGenerator.Create(); - //foreach (var itm in _ls) - //{ - // itm.TaskId = _guid; - //} - //await _wmsefRespository.GetDbContext().BulkInsertAsync(_ls); - //var uniapi = new TS_UNI_API(GuidGenerator.Create(), "1", input.Version, "WmsKanbanOutPutDetail",_first.BillNum, 0,0 ,_guid) - //{ - // TaskId = _guid, - // SourceBillNum = _first.BillNum, - // TableName = "WmsKanbanOutPutDetail", - // InterfaceType = "2", - // Version = input.Version, - // SettleAccountState = 0, - // WmsState=0 - //}; - //var _l = new List(); - //_l.Add(uniapi); - //await _wmsefRespository.GetDbContext().BulkInsertAsync(_l); + } } return true; @@ -429,25 +410,30 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts [Route("WmsKanbanOutPut-Cancel")] public async Task WmsKanbanOutPutCancel(WmsJitRequestDto input) { - var _ls = await _wmsRepository.Where(p => input.Guids.Contains(p.Id) && p.Version == input.Version && p.State == 1).ToListAsync(); - var _first = _ls.FirstOrDefault(); - if (_ls.Count()>0) + if (input.Guids != null && input.Guids.Count() > 0) { - //var _guid = GuidGenerator.Create(); - //await _wmsefRespository.GetDbContext().BulkInsertAsync(_ls,new BulkConfig() { BulkCopyTimeout=0 }); - //var uniapi = new TS_UNI_API(GuidGenerator.Create(), "1", input.Version, "WmsKanbanOutPutDetail", _first.BillNum, 0,0, _guid) - //{ - // TaskId = _guid, - // SourceBillNum = _first.BillNum, - // TableName = "WmsKanbanOutPutDetail", - // InterfaceType = "2", - // Version = input.Version, - // WmsState = 0, - // SettleAccountState=0 - //}; - //var _l = new List(); - //_l.Add(uniapi); - //await _wmsefRespository.GetDbContext().BulkInsertAsync(_l); + List _ls = new List(); + foreach (var itm in input.Guids) + { + _ls.Add(string.Format("{0}", itm)); + } + + string str = string.Join(",", _ls.ToArray()); + + var sql = "DECLARE @return_value int\n" + + "EXEC @return_value = [dbo].[p_wms_output_cancel]\n" + + " @Guids ={0}, \n" + + " @billnum = N'{1}',\n" + + " @type = 2,\n" + + " @accountdate = N'{2}'\n" + + "SELECT 'Return Value' = @return_value"; + + sql = string.Format(sql, str, input.BillNum, input.AccountDate); + + await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( + sql + ); + } return true; } @@ -488,12 +474,12 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts } _lst.AddRange(_lsCopy.ToArray()); - var _ls1 = _lst.Where(p => p.ParentMaterialCode == p.MaterialCode).ToList(); + var outPutDetail = await _wmsRepository.Where(p => p.Version == version).ToListAsync(); var error = from itm1 in outPutDetail - join itm2 in _ls1 on + join itm2 in _lst on new { itm1.MaterialCode, itm1.Kanban } equals new { itm2.MaterialCode, itm2.Kanban } @@ -513,14 +499,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts - - - - - - - - var query = from itm1 in _ls1 + var query = from itm1 in _lst join itm2 in outPutDetail on new { itm1.MaterialCode, itm1.Kanban } equals diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs index 2e1d2f33..67af3e2a 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs @@ -350,26 +350,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts "SELECT 'Return Value' = @return_value"; await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( string.Format(sql, input.BillNum)); - //var _first = _ls.FirstOrDefault(); - //var _guid = GuidGenerator.Create(); - //foreach (var itm in _ls) - //{ - // itm.TaskId = _guid; - //} - //await _wmsefRespository.GetDbContext().BulkInsertAsync(_ls); - //var uniapi = new TS_UNI_API(GuidGenerator.Create(), "1", input.Version, "WmsSharePartOutPutDetail",_first.BillNum, 0,0 ,_guid) - //{ - // TaskId = _guid, - // SourceBillNum = _first.BillNum, - // TableName = "WmsSharePartOutPutDetail", - // InterfaceType = "3", - // Version = input.Version, - // SettleAccountState = 0, - // WmsState=0 - //}; - //var _l = new List(); - //_l.Add(uniapi); - //await _wmsefRespository.GetDbContext().BulkInsertAsync(_l); + } } return true; @@ -384,25 +365,30 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts [Route("WmsSharePartOutPut-Cancel")] public async Task WmsSharePartOutPutCancel(WmsJitRequestDto input) { - var _ls = await _wmsRepository.Where(p => input.Guids.Contains(p.Id) && p.Version == input.Version && p.State == 1).ToListAsync(); - var _first = _ls.FirstOrDefault(); - if (_ls.Count()>0) + if(input.Guids != null && input.Guids.Count() > 0) { - var _guid = GuidGenerator.Create(); - await _wmsefRespository.GetDbContext().BulkInsertAsync(_ls,new BulkConfig() { BulkCopyTimeout=0 }); - var uniapi = new TS_UNI_API(GuidGenerator.Create(), "1", input.Version, "WmsSharePartOutPutDetail", _first.BillNum, 0,0, _guid) + List _ls = new List(); + foreach (var itm in input.Guids) { - TaskId = _guid, - SourceBillNum = _first.BillNum, - TableName = "WmsSharePartOutPutDetail", - InterfaceType = "3", - Version = input.Version, - WmsState = 0, - SettleAccountState=0 - }; - var _l = new List(); - _l.Add(uniapi); - await _wmsefRespository.GetDbContext().BulkInsertAsync(_l); + _ls.Add(string.Format("{0}", itm)); + } + + string str = string.Join(",", _ls.ToArray()); + + var sql = "DECLARE @return_value int\n" + + "EXEC @return_value = [dbo].[p_wms_output_cancel]\n" + + " @Guids ={0}, \n" + + " @billnum = N'{1}',\n" + + " @type = 2,\n" + + " @accountdate = N'{2}'\n" + + "SELECT 'Return Value' = @return_value"; + + sql = string.Format(sql, str, input.BillNum, input.AccountDate); + + await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( + sql + ); + } return true; } @@ -417,8 +403,6 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts var result = await _exportImporter.ExtendExcelImport(files, _excelImportService); List _lst = new List(); - - var _lsCopy = new List(); foreach (var itm in result) { @@ -470,11 +454,6 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts return await ExportErrorReportAsync(checkList); } - - - - - var query = from itm1 in _ls1 join itm2 in outPutDetail on new { itm1.MaterialCode, itm1.OrderBillNum } diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs index cd2bfa3e..e1a8319d 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs @@ -72,8 +72,7 @@ namespace Win.Sfs.SettleAccount.Reports.ReportServices _invoiceVersionRepository = invoiceVersionRepository; _fisVersionrepository = fisVersionrepository; _itemInvoicePriceVersionrepository = itemInvoicePriceVersionrepository; - //_versionRepository = versionRepository; - //_repository = repository; + _service = service; } @@ -249,22 +248,8 @@ namespace Win.Sfs.SettleAccount.Reports.ReportServices }); return _taskid; } - - - - - - - - - - - - - #endregion - [HttpGet] [Route("SharePartUnSettledExport")] [DisableRequestSizeLimit] @@ -315,125 +300,6 @@ namespace Win.Sfs.SettleAccount.Reports.ReportServices } - - - - - - /// - /// 未结算对比 - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - //[HttpGet] - //[Route("UnSettledDiff-Make")] - //[DisableRequestSizeLimit] - - //public async Task UnSettledMake(string year, string period, string version, string customerCode, string factory, string matialCode, string state,DateTime begin,DateTime end) - //{ - - // List customConditionList = new List(); - // customConditionList.Add(new CustomCondition() { Name = "Version", Value = version ?? string.Empty }); - // customConditionList.Add(new CustomCondition() { Name = "CustomerCode", Value = customerCode ?? string.Empty }); - // customConditionList.Add(new CustomCondition() { Name = "Factory", Value = factory ?? string.Empty }); - // customConditionList.Add(new CustomCondition() { Name = "State", Value = state ?? "0" }); - // customConditionList.Add(new CustomCondition() { Name = "MatialCode", Value = matialCode ?? "0" }); - // customConditionList.Add(new CustomCondition() { Name = "ProjectName", Value = "未结算对比" }); - // customConditionList.Add(new CustomCondition() { Name = "Year", Value = year ?? string.Empty }); - // customConditionList.Add(new CustomCondition() { Name = "BegingTime", Value = begin.ToString() }); - // customConditionList.Add(new CustomCondition() { Name = "EndTime", Value = end.ToString() }); - - // var _taskid = await _service.ExportEnqueueAsync("未结算对比", ExportExtentsion.Excel,version, string.IsNullOrEmpty(materialGroup) ? string.Empty : materialGroup, CurrentUser, typeof(UnSettledExportService), customConditionList, (rs) => - // { - // }); - // return _taskid; - //} - - - /// - /// ERP总成开票报表功能 - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - //[HttpGet] - //[Route("FisUnSettledDiff-Make")] - //[DisableRequestSizeLimit] - - //public async Task FisUnSettledMake(string year, string version, string customerCode, string factory, string state) - //{ - - // List customConditionList = new List(); - // customConditionList.Add(new CustomCondition() { Name = "Version", Value = version ?? string.Empty }); - // customConditionList.Add(new CustomCondition() { Name = "CustomerCode", Value = customerCode ?? string.Empty }); - // customConditionList.Add(new CustomCondition() { Name = "Factory", Value = factory ?? string.Empty }); - // customConditionList.Add(new CustomCondition() { Name = "State", Value = state ?? "0" }); - // customConditionList.Add(new CustomCondition() { Name = "ProjectName", Value = "ERP总成开票报表" }); - // customConditionList.Add(new CustomCondition() { Name = "Year", Value = year ?? DateTime.Now.Year.ToString() }); - - // var _taskid = await _service.ExportEnqueueAsync("ERP总成开票报表", ExportExtentsion.Excel,version,string.Empty ,CurrentUser, typeof(fisUnsettledDiffReport), customConditionList, (rs) => - // { - // }); - // return _taskid; - //} - - /// - /// 价差量差分析报表 - /// - /// - /// - /// - /// - /// - /// - //[HttpGet] - //[Route("PriceQtyDiff-Make")] - //[DisableRequestSizeLimit] - - //public async Task PriceQtyDiffMake(string year, string version, string customerCode, string factory, string state) - //{ - // //if (!_invoiceVersionRepository.Any(p => p.Version == version)) - // //{ - // // throw new BusinessException("8989", string.Format("不存发票{0}期间", version)); - // //} - // //if (!_settleAccountVersionrepository.Any(p => p.Version == version)) - // //{ - // // throw new BusinessException("8989", string.Format("不存结算{0}期间", version)); - // //} - // //if (!_itemInvoicePriceVersionrepository.Any(p => p.Version == version)) - // //{ - // // throw new BusinessException("8989", string.Format("不存QAD价格导入{0}期间", version)); - // //} - // List customConditionList = new List(); - // customConditionList.Add(new CustomCondition() { Name = "Version", Value = version ?? string.Empty }); - // customConditionList.Add(new CustomCondition() { Name = "CustomerCode", Value = customerCode ?? string.Empty }); - // customConditionList.Add(new CustomCondition() { Name = "Factory", Value = factory ?? string.Empty }); - // customConditionList.Add(new CustomCondition() { Name = "State", Value = state ?? "0" }); - // customConditionList.Add(new CustomCondition() { Name = "ProjectName", Value = "价差量差分析报表" }); - // customConditionList.Add(new CustomCondition() { Name = "Year", Value = year ?? DateTime.Now.Year.ToString() }); - - // var _taskid = await _service.ExportEnqueueAsync("价差量差分析报表", ExportExtentsion.Excel,version,string.Empty ,CurrentUser, typeof(PriceQtyDifferenceExportService), customConditionList, (rs) => - // { - // }); - // return _taskid; - //} - - /// /// 1.大众发票与结算核对汇总表 /// @@ -510,10 +376,7 @@ namespace Win.Sfs.SettleAccount.Reports.ReportServices [DisableRequestSizeLimit] public async Task UnInvoiceSettledDetailDiffMake( - - BaseRequestDto request - ) { List customConditionList = new List(); diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml b/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml index 15663265..27dd12f1 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml @@ -1787,6 +1787,126 @@ + + + wms出库 + + + + + + + + + + + + + + + 准时化出库主表 + + + + + + + 准时化出库明细 + + + + + + + 任务明细标记已确认 + + 上传的文件(前端已经限制只能上传一个附件) + + + + + 选择任务，生成出库单，只包含已确认的单据 + + + + + + + + 出库界面功能，核准出库功能 + + + + + + + + 出库界面功能， 撤销核准出库 + + + + + + + + wms出库 + + + + + + + + + + + + + + + 准时化出库主表 + + + + + + + 准时化出库明细 + + + + + + + 任务明细标记已确认 + + 上传的文件(前端已经限制只能上传一个附件) + + + + + 选择任务，生成出库单，只包含已确认的单据 + + + + + + + + 出库界面功能，核准出库功能 + + + + + + + + 出库界面功能， 撤销核准出库 + + + + + wms出库 diff --git a/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TaskList.cs b/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TaskList.cs index 01b4920b..53f61f23 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TaskList.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TaskList.cs @@ -271,11 +271,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS } - - // 交货单号 实际发货日期 KENN号 底盘号 物料号 物料描述 客户物料 组件组物料 组件组物料描述 物料组(车型) 定价 金额 结算平台未结数量 大众R3未结数量 差异金额 差异数量 漏结标识 漏结期间 说明 - - [ImporterHeader(Name = "组件组物料",IsIgnore =true)] public string ParentMaterialCode { set; get; } [ImporterHeader(Name = "交货单号")] @@ -393,9 +389,6 @@ namespace Win.Sfs.SettleAccount.Entities.WMS // 交货单号 实际发货日期 KENN号 底盘号 物料号 物料描述 客户物料 组件组物料 组件组物料描述 物料组(车型) 定价 金额 结算平台未结数量 大众R3未结数量 差异金额 差异数量 漏结标识 漏结期间 说明 [ImporterHeader(Name = "行号")] public string PoLine { set; get; } - - //交货单号 - [ImporterHeader(Name = "组件组物料", IsIgnore = true)] public string ParentMaterialCode { set; get; } [ImporterHeader(Name = "交货单号")] @@ -550,6 +543,229 @@ namespace Win.Sfs.SettleAccount.Entities.WMS public Guid TaskId { set; get; } } + + + public class WmsHQHKanbanOutPut : FullAuditedAggregateRootBase + { + public WmsHQHKanbanOutPut() + { + } + + public WmsHQHKanbanOutPut(Guid id, string version, string billNum, string creator) : base(id) + { + Id = id; + Version = version; + BillNum = billNum; + Creator = creator; + } + + public string Version { set; get; } + public string BillNum { set; get; } + public string Creator { set; get; } + } + + + /// + /// 看板明细 + /// + public class WmsHQHKanbanOutPutDetial : FullAuditedAggregateRootBase + { + public WmsHQHKanbanOutPutDetial() + { + } + + public WmsHQHKanbanOutPutDetial(Guid id, string wmsBillNum, string kanban, string materialCode, string materialDesc, string materialGroup, string outPut, string inPut, int state, string extend1, string extend2, string extend3, string parentMaterialCode, string billNum, Guid taskId, string remark, decimal qty, string poline) + { + Id = id; + WmsBillNum = wmsBillNum; + Kanban = kanban; + MaterialCode = materialCode; + MaterialDesc = materialDesc; + MaterialGroup = materialGroup; + OutPut = outPut; + InPut = inPut; + State = state; + Extend1 = extend1; + Extend2 = extend2; + Version = extend3; + ParentMaterialCode = parentMaterialCode; + BillNum = billNum; + TaskId = taskId; + Remark = remark; + Qty = qty; + PoLine = poline; + } + public void SetData(Guid id, string remark, string wmsbillnum, string version, Guid taskId) + { + Id = id; + Remark = remark; + WmsBillNum = wmsbillnum; + Version = version; + TaskId = taskId; + } + + + // 交货单号 实际发货日期 KENN号 底盘号 物料号 物料描述 客户物料 组件组物料 组件组物料描述 物料组(车型) 定价 金额 结算平台未结数量 大众R3未结数量 差异金额 差异数量 漏结标识 漏结期间 说明 + [ImporterHeader(Name = "行号")] + public string PoLine { set; get; } + [ImporterHeader(Name = "组件组物料", IsIgnore = true)] + public string ParentMaterialCode { set; get; } + [ImporterHeader(Name = "交货单号")] + public string WmsBillNum { set; get; } + [ImporterHeader(Name = "条码号")] + //KENN号 + public string Kanban { set; get; } + + [ImporterHeader(Name = "物料号")] + //物料号 + public string MaterialCode { set; get; } + [ImporterHeader(Name = "物料描述")] + //物料描述 + public string MaterialDesc { set; get; } + [ImporterHeader(Name = "物料组(车型)")] + //物料组(车型) + public string MaterialGroup { set; get; } + [ImporterHeader(Name = "出库库位", IsIgnore = true)] + //出库库位 + public string OutPut { set; get; } + [ImporterHeader(Name = "入库库位", IsIgnore = true)] + //入库库位 + public string InPut { set; get; } + [ImporterHeader(Name = "状态", IsIgnore = true)] + public int State { get; set; } + [ImporterHeader(Name = "客户物料")] + /// + /// 扩展字段1 + /// + public string Extend1 { set; get; } + /// + /// 扩展字段2 + /// + [ImporterHeader(Name = "订单日期")] + public string Extend2 { set; get; } + /// + /// 扩展字段3 + /// + [ImporterHeader(Name = "版本号", IsIgnore = true)] + public string Version { set; get; } + [ImporterHeader(Name = "结算数量")] + public decimal Qty { set; get; } + + [ImporterHeader(Name = "单据", IsIgnore = true)] + public string BillNum { set; get; } + + [ImporterHeader(Name = "任务", IsIgnore = true)] + public Guid TaskId { set; get; } + + + } + + /// + /// 备件出库 + /// + public class WmsHQHSharePartOutPut : FullAuditedAggregateRootBase + { + public WmsHQHSharePartOutPut() + { + } + public WmsHQHSharePartOutPut(Guid id, string version, string billNum, string creator) : base(id) + { + Id = id; + Version = version; + BillNum = billNum; + Creator = creator; + } + public string Version { set; get; } + public string BillNum { set; get; } + public string Creator { set; get; } + + } + + + /// + /// 备件出库明细 + /// + public class WmsHQHSharePartOutPutDetial : FullAuditedAggregateRootBase + { + public WmsHQHSharePartOutPutDetial() + { + } + public WmsHQHSharePartOutPutDetial(Guid id, string wmsBillNum, string orderBillNum, string materialCode, string materialDesc, string materialGroup, string outPut, string inPut, int state, string extend1, string extend2, string extend3, string parentMaterialCode, string billNum, Guid taskId, string remark, decimal qty) + { + Id = id; + WmsBillNum = wmsBillNum; + OrderBillNum = orderBillNum; + MaterialCode = materialCode; + MaterialDesc = materialDesc; + MaterialGroup = materialGroup; + OutPut = outPut; + InPut = inPut; + State = state; + Extend1 = extend1; + Extend2 = extend2; + Version = extend3; + ParentMaterialCode = parentMaterialCode; + BillNum = billNum; + TaskId = taskId; + Remark = remark; + Qty = qty; + } + public void SetId(Guid id) + { + Id = id; + } + //交货单号 + + [ImporterHeader(Name = "组件组物料")] + public string ParentMaterialCode { set; get; } + [ImporterHeader(Name = "交货单号")] + public string WmsBillNum { set; get; } + [ImporterHeader(Name = "看板号")] + //KENN号 + public string OrderBillNum { set; get; } + [ImporterHeader(Name = "SAP编码")] + //物料号 + public string MaterialCode { set; get; } + [ImporterHeader(Name = "物料描述")] + //物料描述 + public string MaterialDesc { set; get; } + [ImporterHeader(Name = "物料组(车型)")] + //物料组(车型) + public string MaterialGroup { set; get; } + [ImporterHeader(Name = "出库库位", IsIgnore = true)] + //出库库位 + public string OutPut { set; get; } + [ImporterHeader(Name = "入库库位", IsIgnore = true)] + //入库库位 + public string InPut { set; get; } + [ImporterHeader(Name = "状态", IsIgnore = true)] + public int State { get; set; } + [ImporterHeader(Name = "物料代码")] + /// + /// 扩展字段1 + /// + public string Extend1 { set; get; } + /// + /// 扩展字段2 + /// + [ImporterHeader(Name = "扩展字段2", IsIgnore = true)] + public string Extend2 { set; get; } + /// + /// 扩展字段3 + /// + [ImporterHeader(Name = "版本号", IsIgnore = true)] + public string Version { set; get; } + [ImporterHeader(Name = "开票数量")] + public decimal Qty { set; get; } + [ImporterHeader(Name = "数量", IsIgnore = true)] + public string BillNum { set; get; } + public Guid TaskId { set; get; } + } + + + + + #endregion /// @@ -714,8 +930,6 @@ namespace Win.Sfs.SettleAccount.Entities.WMS } // 交货单号 实际发货日期 KENN号 底盘号 物料号 物料描述 客户物料 组件组物料 组件组物料描述 物料组(车型) 定价 金额 结算平台未结数量 大众R3未结数量 差异金额 差异数量 漏结标识 漏结期间 说明 - - //交货单号 [ImporterHeader(Name = "组件组物料")] diff --git a/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/WmsOutPutPercent.cs b/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/WmsOutPutPercent.cs new file mode 100644 index 00000000..52acfb16 --- /dev/null +++ b/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/WmsOutPutPercent.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Win.Sfs.Shared.DomainBase; + +namespace Win.Sfs.SettleAccount.Entities.WMS +{ + public class WmsOutPutPercent:FullAuditedAggregateRootBase + { + public WmsOutPutPercent(Guid id,decimal completeQty, decimal applyQty, decimal cancelQty):base(id) + { + CompleteQty = completeQty; + ApplyQty = applyQty; + CancelQty = cancelQty; + } + + public decimal CompleteQty { set; get; } + + public decimal ApplyQty { set; get; } + + public decimal CancelQty { set; get; } + + + + } +} diff --git a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountDbContextModelCreatingExtensions.cs b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountDbContextModelCreatingExtensions.cs index ba80cc36..b6c60ee9 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountDbContextModelCreatingExtensions.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountDbContextModelCreatingExtensions.cs @@ -333,9 +333,19 @@ namespace Win.Sfs.SettleAccount builder.ConfigureWmsKanbanOutPutDetail(options); builder.ConfigureWmsSharePartOutPutDetail(options); builder.ConfigureWmsSharePartOutPutVersion(options); + builder.ConfigureHQFKanban(options); builder.ConfigureHQMKanban(options); builder.ConfigureHQHKanban(options); + builder.ConfigureWmsHQFKanbanOutPutVersion(options); + builder.ConfigureWmsHQFKanbanOutPutDetial(options); + builder.ConfigureWmsHQFSharePartOutPutVersion(options); + builder.ConfigureWmsHQFSharePartOutPutDetial(options); + builder.ConfigureWmsHQHKanbanOutPutVersion(options); + builder.ConfigureWmsHQHKanbanOutPutDetial(options); + builder.ConfigureWmsHQHSharePartOutPutVersion(options); + builder.ConfigureWmsHQHSharePartOutPutDetial(options); + #endregion } @@ -1228,6 +1238,159 @@ namespace Win.Sfs.SettleAccount } + private static void ConfigureWmsHQFKanbanOutPutVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) + { + + builder.Entity(b => + { + b.ToTable($"{options.TablePrefix}_WmsHQFKanbanOutPut", options.Schema); + b.ConfigureByConvention(); + b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); + b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); + + b.HasIndex(x => new { x.BillNum }); + }); + + } + private static void ConfigureWmsHQFKanbanOutPutDetial(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) + { + + builder.Entity(b => + { + b.ToTable($"{options.TablePrefix}_WmsHQFKanbanOutPutDetial", options.Schema); + b.ConfigureByConvention(); + b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); + b.Property(x => x.WmsBillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); + b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); + b.Property(x => x.OutPut).HasMaxLength(CommonConsts.MaxCodeLength); + b.Property(x => x.InPut).HasMaxLength(CommonConsts.MaxCodeLength); + b.Property(x => x.PoLine).HasMaxLength(CommonConsts.MaxCodeLength); + b.Property(x => x.Kanban).HasMaxLength(CommonConsts.MaxCodeLength); + b.Property(x => x.ParentMaterialCode).HasMaxLength(CommonConsts.MaxCodeLength); + b.Property(x => x.Extend1).HasMaxLength(CommonConsts.MaxCodeLength); + b.Property(x => x.Extend2).HasMaxLength(CommonConsts.MaxCodeLength); + b.Property(x => x.MaterialCode).HasMaxLength(CommonConsts.MaxCodeLength); + b.HasIndex(x => new { x.Version }).IsUnique().HasFilter(IsDeletedFilter); + }); + + } + + private static void ConfigureWmsHQFSharePartOutPutVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) + { + + builder.Entity(b => + { + b.ToTable($"{options.TablePrefix}_WmsHQFSharePartOutPut", options.Schema); + b.ConfigureByConvention(); + b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); + b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); + + b.HasIndex(x => new { x.BillNum }); + }); + + } + private static void ConfigureWmsHQFSharePartOutPutDetial(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) + { + + builder.Entity(b => + { + b.ToTable($"{options.TablePrefix}_WmsHQFSharePartOutPutDetial", options.Schema); + b.ConfigureByConvention(); + b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); + b.Property(x => x.WmsBillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); + b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); + b.Property(x => x.OutPut).HasMaxLength(CommonConsts.MaxCodeLength); + b.Property(x => x.InPut).HasMaxLength(CommonConsts.MaxCodeLength); + b.Property(x => x.OrderBillNum).HasMaxLength(CommonConsts.MaxCodeLength); + + //b.Property(x => x.PoLine).HasMaxLength(CommonConsts.MaxCodeLength); + //b.Property(x => x.Kanban).HasMaxLength(CommonConsts.MaxCodeLength); + b.Property(x => x.ParentMaterialCode).HasMaxLength(CommonConsts.MaxCodeLength); + b.Property(x => x.Extend1).HasMaxLength(CommonConsts.MaxCodeLength); + b.Property(x => x.Extend2).HasMaxLength(CommonConsts.MaxCodeLength); + b.Property(x => x.MaterialCode).HasMaxLength(CommonConsts.MaxCodeLength); + b.HasIndex(x => new { x.Version }).IsUnique().HasFilter(IsDeletedFilter); + }); + + } + + private static void ConfigureWmsHQHKanbanOutPutVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) + { + + builder.Entity(b => + { + b.ToTable($"{options.TablePrefix}_WmsHQHKanbanOutPut", options.Schema); + b.ConfigureByConvention(); + b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); + b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); + + b.HasIndex(x => new { x.BillNum }); + }); + + } + private static void ConfigureWmsHQHKanbanOutPutDetial(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) + { + + builder.Entity(b => + { + b.ToTable($"{options.TablePrefix}_WmsHQHKanbanOutPutDetial", options.Schema); + b.ConfigureByConvention(); + b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); + b.Property(x => x.WmsBillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); + b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); + b.Property(x => x.OutPut).HasMaxLength(CommonConsts.MaxCodeLength); + b.Property(x => x.InPut).HasMaxLength(CommonConsts.MaxCodeLength); + b.Property(x => x.PoLine).HasMaxLength(CommonConsts.MaxCodeLength); + b.Property(x => x.Kanban).HasMaxLength(CommonConsts.MaxCodeLength); + b.Property(x => x.ParentMaterialCode).HasMaxLength(CommonConsts.MaxCodeLength); + b.Property(x => x.Extend1).HasMaxLength(CommonConsts.MaxCodeLength); + b.Property(x => x.Extend2).HasMaxLength(CommonConsts.MaxCodeLength); + b.Property(x => x.MaterialCode).HasMaxLength(CommonConsts.MaxCodeLength); + b.HasIndex(x => new { x.Version }).IsUnique().HasFilter(IsDeletedFilter); + }); + + } + + private static void ConfigureWmsHQHSharePartOutPutVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) + { + + builder.Entity(b => + { + b.ToTable($"{options.TablePrefix}_WmsHQHSharePartOutPut", options.Schema); + b.ConfigureByConvention(); + b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); + b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); + + b.HasIndex(x => new { x.BillNum }); + }); + + } + private static void ConfigureWmsHQHSharePartOutPutDetial(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options) + { + + builder.Entity(b => + { + b.ToTable($"{options.TablePrefix}_WmsHQHSharePartOutPutDetial", options.Schema); + b.ConfigureByConvention(); + b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); + b.Property(x => x.WmsBillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); + b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength); + b.Property(x => x.OutPut).HasMaxLength(CommonConsts.MaxCodeLength); + b.Property(x => x.InPut).HasMaxLength(CommonConsts.MaxCodeLength); + b.Property(x => x.OrderBillNum).HasMaxLength(CommonConsts.MaxCodeLength); + + //b.Property(x => x.PoLine).HasMaxLength(CommonConsts.MaxCodeLength); + //b.Property(x => x.Kanban).HasMaxLength(CommonConsts.MaxCodeLength); + b.Property(x => x.ParentMaterialCode).HasMaxLength(CommonConsts.MaxCodeLength); + b.Property(x => x.Extend1).HasMaxLength(CommonConsts.MaxCodeLength); + b.Property(x => x.Extend2).HasMaxLength(CommonConsts.MaxCodeLength); + b.Property(x => x.MaterialCode).HasMaxLength(CommonConsts.MaxCodeLength); + b.HasIndex(x => new { x.Version }).IsUnique().HasFilter(IsDeletedFilter); + }); + + } + + #endregion diff --git a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQFSettledDetailDapperRepository.cs b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQFSettledDetailDapperRepository.cs index a8aab722..84b248b9 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQFSettledDetailDapperRepository.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQFSettledDetailDapperRepository.cs @@ -116,7 +116,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report List _list = new List(); - string condition = " where 1=1 "; + string condition = " "; ////if (!string.IsNullOrEmpty(materialCode)) diff --git a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQFShippingDapperRepository.cs b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQFShippingDapperRepository.cs new file mode 100644 index 00000000..cc8cd239 --- /dev/null +++ b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQFShippingDapperRepository.cs @@ -0,0 +1,107 @@ +using Dapper; +using Magicodes.ExporterAndImporter.Core; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Volo.Abp.DependencyInjection; +using Volo.Abp.Domain.Repositories.Dapper; +using Volo.Abp.EntityFrameworkCore; + +namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report +{ + public class HQFShippingDapperRepository : DapperRepository, ITransientDependency + { + public HQFShippingDapperRepository(IDbContextProvider dbContextProvider) + : base(dbContextProvider) + { + } + public virtual List GetHQFShippingReportList(string version, string begin, string end) + { + + List _list = new List(); + + string condition = " where 1=1 "; + if (!string.IsNullOrEmpty(begin)) + { + condition += string.Format(" and b.LastModificationTime>='{0}' ", begin); + } + if (!string.IsNullOrEmpty(end)) + { + condition += string.Format(" and b.LastModificationTime<='{0}' ", end); + } + string str = + "SELECT\n" + + " temp1.*,\n" + + " Isnull( TEMP2.Price, 0 ) 单价 ,\n" + + " Round( Isnull( TEMP2.Price, 0 ) * temp1.数量, 2 ) 金额 \n" + + "FROM\n" + + " (\n" + + " SELECT\n" + + " A.LastModificationTime 交货时间,\n" + + " A.WmsBillNum 交货单号,\n" + + " A.PoLine 行号,\n" + + " A.MaterialCode 发货零件号,\n" + + " B.MaterialCode Sap零件号,\n" + + " A.MaterialDesc 物料描述,\n" + + " A.Qty 数量,\n" + + " A.Kanban 看板号,\n" + + " A.IsAuto 手工或自动 ,\n" + + " A.Warehouse 收货仓库,\n" + + " A.WarehouseDesc 收货仓库描述,\n" + + " A.Supplier 供应商 \n" + + " FROM\n" + + " Set_HQ_H_Kanban AS A\n" + + " LEFT OUTER JOIN Set_HQ_F_Platform AS B ON A.Kanban = B.HQHKanBan \n" + + " AND A.MaterialCode = B.MaterialCode\n" + + " LEFT OUTER JOIN Set_material AS C ON A.MaterialCode = C.CustomerPartCode \n" + + " WHERE\n" + + " ( B.Id IS NULL ) \n" + + " {0} \n" + + " ) TEMP1\n" + + " LEFT JOIN ( SELECT Price, MaterialCode FROM Set_PriceList WHERE ( Version = ( SELECT MAX ( Version ) FROM Set_PriceList ) ) ) TEMP2 ON temp1.Sap零件号= temp2.MaterialCode"; + var _sql = string.Format(str, condition); + + var _query = DbConnection.Query(_sql, null, null, true, 1200, null); + _list = _query.ToList(); + return _list; + + } + + } + + + public class HQFShippingDiff + { + [ExporterHeader(DisplayName = "交货单号")] + public string 交货单号 { set; get; } + [ExporterHeader(DisplayName = "交货时间")] + public string 交货时间 { set; get; } + [ExporterHeader(DisplayName = "行号")] + public string 行号 { set; get; } + + [ExporterHeader(DisplayName = "发货零件号")] + public string 发货零件号 { set; get; } + + [ExporterHeader(DisplayName = "Sap零件号")] + public string Sap零件号 { set; get; } + + [ExporterHeader(DisplayName = "物料描述")] + public string 物料描述 { set; get; } + + [ExporterHeader(DisplayName = "数量")] + public decimal 数量 { set; get; } + [ExporterHeader(DisplayName = "看板号")] + public string 看板号 { set; get; } + [ExporterHeader(DisplayName = "手工或自动")] + public string 手工或自动 { set; get; } + [ExporterHeader(DisplayName = "收货仓库")] + public string 收货仓库 { set; get; } + [ExporterHeader(DisplayName = "收货仓库描述")] + public string 收货仓库描述 { set; get; } + [ExporterHeader(DisplayName = "供应商")] + public string 供应商 { set; get; } + + } +} diff --git a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQHShippingDapperRepository.cs b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQHShippingDapperRepository.cs new file mode 100644 index 00000000..fe6f333b --- /dev/null +++ b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQHShippingDapperRepository.cs @@ -0,0 +1,109 @@ +using Dapper; +using Magicodes.ExporterAndImporter.Core; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Volo.Abp.DependencyInjection; +using Volo.Abp.Domain.Repositories.Dapper; +using Volo.Abp.EntityFrameworkCore; + +namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report +{ + + public class HQHShippingDapperRepository : DapperRepository, ITransientDependency + { + public HQHShippingDapperRepository(IDbContextProvider dbContextProvider) + : base(dbContextProvider) + { + } + public virtual List GetHQHShippingReportList(string version, string materialCode, string begin, string end, string materialGroup) + { + + List _list = new List(); + + string condition = " where 1=1 "; + if (!string.IsNullOrEmpty(begin)) + { + condition += string.Format(" and b.LastModificationTime>='{0}' ", begin); + } + if (!string.IsNullOrEmpty(end)) + { + condition += string.Format(" and b.LastModificationTime<='{0}' ", end); + } + string str = + "SELECT\n" + + " temp1.*,\n" + + " Isnull( TEMP2.Price, 0 ) 单价 ,\n" + + " Round( Isnull( TEMP2.Price, 0 ) * temp1.数量, 2 ) 金额 \n" + + "FROM\n" + + " (\n" + + " SELECT\n" + + " A.LastModificationTime 交货时间,\n" + + " A.WmsBillNum 交货单号,\n" + + " A.PoLine 行号,\n" + + " A.MaterialCode 发货零件号,\n" + + " B.MaterialCode Sap零件号,\n" + + " A.MaterialDesc 物料描述,\n" + + " A.Qty 数量,\n" + + " A.Kanban 看板号,\n" + + " A.IsAuto 手工或自动 ,\n" + + " A.Warehouse 收货仓库,\n" + + " A.WarehouseDesc 收货仓库描述,\n" + + " A.Supplier 供应商 \n" + + " FROM\n" + + " Set_HQ_H_Kanban AS A\n" + + " LEFT OUTER JOIN Set_HQ_H_Platform AS B ON A.Kanban = B.HQHKanBan \n" + + " AND A.MaterialCode = B.MaterialCode\n" + + " LEFT OUTER JOIN Set_material AS C ON A.MaterialCode = C.CustomerPartCode \n" + + " WHERE\n" + + " ( B.Id IS NULL ) \n" + + " {0} \n" + + " ) TEMP1\n" + + " LEFT JOIN ( SELECT Price, MaterialCode FROM Set_PriceList WHERE ( Version = ( SELECT MAX ( Version ) FROM Set_PriceList ) ) ) TEMP2 ON temp1.Sap零件号= temp2.MaterialCode"; + var _sql = string.Format(str, condition); + + var _query = DbConnection.Query(_sql, null, null, true, 1200, null); + _list = _query.ToList(); + return _list; + + } + + } + + + public class HQHShippingDiff + { + [ExporterHeader(DisplayName = "交货单号")] + public string 交货单号 { set; get; } + [ExporterHeader(DisplayName = "交货时间")] + public string 交货时间 { set; get; } + [ExporterHeader(DisplayName = "行号")] + public string 行号 { set; get; } + + [ExporterHeader(DisplayName = "发货零件号")] + public string 发货零件号 { set; get; } + + [ExporterHeader(DisplayName = "Sap零件号")] + public string Sap零件号 { set; get; } + + [ExporterHeader(DisplayName = "物料描述")] + public string 物料描述 { set; get; } + + [ExporterHeader(DisplayName = "数量")] + public decimal 数量 { set; get; } + [ExporterHeader(DisplayName = "看板号")] + public string 看板号 { set; get; } + [ExporterHeader(DisplayName = "手工或自动")] + public string 手工或自动 { set; get; } + [ExporterHeader(DisplayName = "收货仓库")] + public string 收货仓库 { set; get; } + [ExporterHeader(DisplayName = "收货仓库描述")] + public string 收货仓库描述 { set; get; } + [ExporterHeader(DisplayName = "供应商")] + public string 供应商 { set; get; } + + } + +} diff --git a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQMShippingDapperRepository.cs b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQMShippingDapperRepository.cs new file mode 100644 index 00000000..6a4ee5b7 --- /dev/null +++ b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQMShippingDapperRepository.cs @@ -0,0 +1,107 @@ +using Dapper; +using Magicodes.ExporterAndImporter.Core; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Volo.Abp.DependencyInjection; +using Volo.Abp.Domain.Repositories.Dapper; +using Volo.Abp.EntityFrameworkCore; + +namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report +{ + public class HQMShippingDapperRepository : DapperRepository, ITransientDependency + { + public HQMShippingDapperRepository(IDbContextProvider dbContextProvider) + : base(dbContextProvider) + { + } + public virtual List GetHQFShippingReportList(string version, string begin, string end) + { + + List _list = new List(); + + string condition = " where 1=1 "; + if (!string.IsNullOrEmpty(begin)) + { + condition += string.Format(" and b.LastModificationTime>='{0}' ", begin); + } + if (!string.IsNullOrEmpty(end)) + { + condition += string.Format(" and b.LastModificationTime<='{0}' ", end); + } + string str = + "SELECT\n" + + " temp1.*,\n" + + " Isnull( TEMP2.Price, 0 ) 单价 ,\n" + + " Round( Isnull( TEMP2.Price, 0 ) * temp1.数量, 2 ) 金额 \n" + + "FROM\n" + + " (\n" + + " SELECT\n" + + " A.LastModificationTime 交货时间,\n" + + " A.WmsBillNum 交货单号,\n" + + " A.PoLine 行号,\n" + + " A.MaterialCode 发货零件号,\n" + + " B.MaterialCode Sap零件号,\n" + + " A.MaterialDesc 物料描述,\n" + + " A.Qty 数量,\n" + + " A.Kanban 看板号,\n" + + " A.IsAuto 手工或自动 ,\n" + + " A.Warehouse 收货仓库,\n" + + " A.WarehouseDesc 收货仓库描述,\n" + + " A.Supplier 供应商 \n" + + " FROM\n" + + " Set_HQ_H_Kanban AS A\n" + + " LEFT OUTER JOIN Set_HQ_M_Platform AS B ON A.Kanban = B.HQMKanBan \n" + + " AND A.MaterialCode = B.MaterialCode\n" + + " LEFT OUTER JOIN Set_material AS C ON A.MaterialCode = C.CustomerPartCode \n" + + " WHERE\n" + + " ( B.Id IS NULL ) \n" + + " {0} \n" + + " ) TEMP1\n" + + " LEFT JOIN ( SELECT Price, MaterialCode FROM Set_PriceList WHERE ( Version = ( SELECT MAX ( Version ) FROM Set_PriceList ) ) ) TEMP2 ON temp1.Sap零件号= temp2.MaterialCode"; + var _sql = string.Format(str, condition); + + var _query = DbConnection.Query(_sql, null, null, true, 1200, null); + _list = _query.ToList(); + return _list; + + } + + } + + + public class HQMShippingDiff + { + [ExporterHeader(DisplayName = "交货单号")] + public string 交货单号 { set; get; } + [ExporterHeader(DisplayName = "交货时间")] + public string 交货时间 { set; get; } + [ExporterHeader(DisplayName = "行号")] + public string 行号 { set; get; } + + [ExporterHeader(DisplayName = "发货零件号")] + public string 发货零件号 { set; get; } + + [ExporterHeader(DisplayName = "Sap零件号")] + public string Sap零件号 { set; get; } + + [ExporterHeader(DisplayName = "物料描述")] + public string 物料描述 { set; get; } + + [ExporterHeader(DisplayName = "数量")] + public decimal 数量 { set; get; } + [ExporterHeader(DisplayName = "看板号")] + public string 看板号 { set; get; } + [ExporterHeader(DisplayName = "手工或自动")] + public string 手工或自动 { set; get; } + [ExporterHeader(DisplayName = "收货仓库")] + public string 收货仓库 { set; get; } + [ExporterHeader(DisplayName = "收货仓库描述")] + public string 收货仓库描述 { set; get; } + [ExporterHeader(DisplayName = "供应商")] + public string 供应商 { set; get; } + + } +} diff --git a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQFShippingExportService.cs b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQFShippingExportService.cs new file mode 100644 index 00000000..e6c33faa --- /dev/null +++ b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQFShippingExportService.cs @@ -0,0 +1,51 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using TaskJob.EventArgs; +using TaskJob.Interfaces; +using Volo.Abp.DependencyInjection; +using Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report; + +namespace SettleAccount.Job.Services.Report +{ + public class HQFShippingExportService : ITransientDependency, IExportJob + { + + private readonly HQFShippingDapperRepository _dapperRepository; + private readonly ErpPartDapperRepository _erpdapperRepository; + + private readonly OutputService _outputService; + private readonly InputService _inputService; + + public HQFShippingExportService( + + ErpPartDapperRepository erpdapperRepository, + HQFShippingDapperRepository dapperRepository, + OutputService outputService, + InputService inputService + ) + { + _inputService = inputService; + _outputService = outputService; + _erpdapperRepository = erpdapperRepository; + + _dapperRepository = dapperRepository; + } + + public string ExportFile(Guid id, List exportName, List p_list) + { + var _filename = exportName.FirstOrDefault(); + var version = p_list.Where(p => p.Name == "Version").FirstOrDefault().Value; + var begin = p_list.Where(p => p.Name == "BeginTime").FirstOrDefault().Value; + var end = p_list.Where(p => p.Name == "EndTime").FirstOrDefault().Value; + var _ls = _dapperRepository.GetHQFShippingReportList(version, begin, end); + + + _outputService.Export(id, _filename, _ls); + return id.ToString(); + } + + } +} diff --git a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQHShippingExportService.cs b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQHShippingExportService.cs new file mode 100644 index 00000000..c334bc70 --- /dev/null +++ b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQHShippingExportService.cs @@ -0,0 +1,57 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using TaskJob.EventArgs; +using TaskJob.Interfaces; +using Volo.Abp.DependencyInjection; +using Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report; + +namespace SettleAccount.Job.Services.Report +{ + public class HQHShippingExportService : ITransientDependency, IExportJob + { + + private readonly HQHShippingDapperRepository _dapperRepository; + private readonly ErpPartDapperRepository _erpdapperRepository; + + private readonly OutputService _outputService; + private readonly InputService _inputService; + + public HQHShippingExportService( + + ErpPartDapperRepository erpdapperRepository, + HQHShippingDapperRepository dapperRepository, + OutputService outputService, + InputService inputService + ) + { + _inputService = inputService; + _outputService = outputService; + _erpdapperRepository = erpdapperRepository; + + _dapperRepository = dapperRepository; + } + + public string ExportFile(Guid id, List exportName, List p_list) + { + var _filename = exportName.FirstOrDefault(); + var version = p_list.Where(p => p.Name == "Version").FirstOrDefault().Value; + var materialCode = p_list.Where(p => p.Name == "MaterialCode").FirstOrDefault().Value; + var kanban = p_list.Where(p => p.Name == "Kanban").FirstOrDefault().Value; + var begin = p_list.Where(p => p.Name == "BeginTime").FirstOrDefault().Value; + var end = p_list.Where(p => p.Name == "EndTime").FirstOrDefault().Value; + var materialGroup = p_list.Where(p => p.Name == "MaterialGroup").FirstOrDefault().Value; + var acceptNo = p_list.Where(p => p.Name == "AcceptNo").FirstOrDefault().Value; + var sapCode = p_list.Where(p => p.Name == "SapCode").FirstOrDefault().Value; + var warehouseDesc = p_list.Where(p => p.Name == "WarehouseDesc").FirstOrDefault().Value; + var _ls = _dapperRepository.GetHQHShippingReportList(version, materialCode, begin, end, materialGroup); + + + _outputService.Export(id, _filename, _ls); + return id.ToString(); + } + + } +} diff --git a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQMSharePartSettledDetailDiffExportService.cs b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQMSharePartSettledDetailDiffExportService.cs new file mode 100644 index 00000000..ba91cf18 --- /dev/null +++ b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQMSharePartSettledDetailDiffExportService.cs @@ -0,0 +1,118 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using TaskJob.EventArgs; +using TaskJob.Interfaces; +using Volo.Abp.DependencyInjection; +using Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report; + +namespace SettleAccount.Job.Services.Report +{ + public class HQMSharePartSettledDetailDiffExportService : ITransientDependency, IExportJob + { + + private readonly HQMSettledDetailDapperRepository _dapperRepository; + private readonly ErpPartDapperRepository _erpdapperRepository; + + private readonly OutputService _outputService; + private readonly InputService _inputService; + + public HQMSharePartSettledDetailDiffExportService( + + ErpPartDapperRepository erpdapperRepository, + HQMSettledDetailDapperRepository dapperRepository, + OutputService outputService, + InputService inputService + ) + { + _inputService = inputService; + _outputService = outputService; + _erpdapperRepository = erpdapperRepository; + + _dapperRepository = dapperRepository; + } + + public string ExportFile(Guid id, List exportName, List p_list) + { + var _filename = exportName.FirstOrDefault(); + var version = p_list.Where(p => p.Name == "Version").FirstOrDefault().Value; + var materialCode = p_list.Where(p => p.Name == "MaterialCode").FirstOrDefault().Value; + var kanban = p_list.Where(p => p.Name == "Kanban").FirstOrDefault().Value; + var begin = p_list.Where(p => p.Name == "BeginTime").FirstOrDefault().Value; + var end = p_list.Where(p => p.Name == "EndTime").FirstOrDefault().Value; + var materialGroup = p_list.Where(p => p.Name == "MaterialGroup").FirstOrDefault().Value; + var acceptNo = p_list.Where(p => p.Name == "AcceptNo").FirstOrDefault().Value; + var sapCode = p_list.Where(p => p.Name == "SapCode").FirstOrDefault().Value; + var warehouseDesc = p_list.Where(p => p.Name == "WarehouseDesc").FirstOrDefault().Value; + var _ls = _dapperRepository.GetSharePartSettledDetailDiffReportList(version, materialCode, begin, end, materialGroup); + //var _ls = _dapperRepository.GetInvoiceSettledDetailDiffReportList(version, materialCode, begin, end, materialGroup); + //var _lst=_dapperRepository.GetDiffQtyList(version); + + //foreach (var itm in _lst) + //{ + // var _first = _ls.FirstOrDefault(p => p.订货看板编号 == itm.看板号 && p.订货零件号==itm.客户物料号); + // if(_first!=null) + // { + // _first.发货数量 = _first.结算数量+ itm.差异数量; + // _first.数量差异 = itm.差异数量; + // } + //} + if (!string.IsNullOrEmpty(kanban)) + { + var _groupList = kanban.Split(new char[] { '\n' }).Distinct().ToList(); + if (_groupList.Count() > 0) + { + _ls = _ls.Where(p => _groupList.Contains(p.结算物料号)).ToList(); + } + } + + + if (!string.IsNullOrEmpty(warehouseDesc)) + { + var _groupList = warehouseDesc.Split(new char[] { '\n' }).Distinct().ToList(); + if (_groupList.Count() > 0) + { + _ls = _ls.Where(p => _groupList.Contains(p.收货仓库描述)).ToList(); + } + } + + //if (!string.IsNullOrEmpty(acceptNo)) + //{ + // var _groupList = acceptNo.Split(new char[] { ',' }).Distinct().ToList(); + // if (_groupList.Count() > 0) + // { + // _ls = _ls.Where(p => _groupList.Contains(p.结算验收单号)).ToList(); + // } + //} + if (!string.IsNullOrEmpty(materialGroup)) + { + var _groupList = materialGroup.Split(new char[] { ',' }).Distinct().ToList(); + if (_groupList.Count() > 0) + { + _ls = _ls.Where(p => _groupList.Contains(p.物料组)).ToList(); + } + } + if (!string.IsNullOrEmpty(materialCode)) + { + var _groupList = materialCode.Split(new char[] { '\n' }).Distinct().ToList(); + if (_groupList.Count() > 0) + { + _ls = _ls.Where(p => _groupList.Contains(p.结算物料号)).ToList(); + } + } + if (!string.IsNullOrEmpty(sapCode)) + { + var _groupList = sapCode.Split(new char[] { '\n' }).Distinct().ToList(); + if (_groupList.Count() > 0) + { + _ls = _ls.Where(p => _groupList.Contains(p.Sap编码)).ToList(); + } + } + _outputService.Export(id, _filename, _ls); + return id.ToString(); + } + + } +} diff --git a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQMShippingExportService.cs b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQMShippingExportService.cs new file mode 100644 index 00000000..6e87486a --- /dev/null +++ b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQMShippingExportService.cs @@ -0,0 +1,51 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using TaskJob.EventArgs; +using TaskJob.Interfaces; +using Volo.Abp.DependencyInjection; +using Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report; + +namespace SettleAccount.Job.Services.Report +{ + public class HQMShippingExportService : ITransientDependency, IExportJob + { + + private readonly HQMShippingDapperRepository _dapperRepository; + private readonly ErpPartDapperRepository _erpdapperRepository; + + private readonly OutputService _outputService; + private readonly InputService _inputService; + + public HQMShippingExportService( + + ErpPartDapperRepository erpdapperRepository, + HQMShippingDapperRepository dapperRepository, + OutputService outputService, + InputService inputService + ) + { + _inputService = inputService; + _outputService = outputService; + _erpdapperRepository = erpdapperRepository; + + _dapperRepository = dapperRepository; + } + + public string ExportFile(Guid id, List exportName, List p_list) + { + var _filename = exportName.FirstOrDefault(); + var version = p_list.Where(p => p.Name == "Version").FirstOrDefault().Value; + var begin = p_list.Where(p => p.Name == "BeginTime").FirstOrDefault().Value; + var end = p_list.Where(p => p.Name == "EndTime").FirstOrDefault().Value; + var _ls = _dapperRepository.GetHQFShippingReportList(version, begin, end); + + + _outputService.Export(id, _filename, _ls); + return id.ToString(); + } + + } +} diff --git a/src/Modules/SettleAccount/数据库修改记录.xlsx b/src/Modules/SettleAccount/数据库修改记录.xlsx deleted file mode 100644 index 28f489d1028d9f729206f9ed0c57dd705a237197..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12756 zcmeHt1y>wdw|3+1F2UV3xVsY)+}&v`xO=eR+7R3!xCD212<|QkE`b1F&&+%8%w*>K z1^2C9tGattJ-h0hwS7OT3Q*A409XJ#001BdG-l*jyoUe)VqgFOEC4*Dt_0A*)!f0= z@SUflxr;uFhrJzH9yBCf4geB-|9_AF!#hxsG^yOnhCFa4+a{6BXjA7T3SYTm+=W5I zPC`cYosd~6kC$j=WyiulL{*#HK2_TO^z5#`fiuI7FtL(6$F0$<*QAT1dWPN}kNOeR zx&M)=m#zYHK$~s}H%@7wi6{TZS15}l`x>+N(a#@TlDN4bkq)|Nl=s9bDcZwe?!;O8 zA@84z&btchFzm)m%ex2iElc`F`cBOyKDjGH;+rkG;w{$7)3ovEM9M1vSS}Mu@=>9q z=Vi|OpLxQb!18j^) zU~4sWHn($OW%=#=Un~7TY?^;rdPRbg0u(!X*jdmE`B=Na3IoNA9jnx#lGzgkd-{_R zPkLOzm!~^vG1uHi5--qa_iWGf8;ja}k9>4*H_Q|%gdmW`Y^z3(!c%iI97dwEbj+!2 zPauU|*-7~gXAHw$?&6JbWW{z~2n+Q~0RDR!js75^7CmcTtz>6>oojitGHSi#y;ory zgsS6Q{S&hA0xnQ_!uM@I+FtW0eYPI;0uC2aGR752PQ+>7$1RB;UvcMYO6fqJhPovQM4Ik84Srf&MPH&can6K{X!gt~GQ?ixI4qVoG3X~vMkO~H zZ(nQFkEPdhM_2@DnDX7V;ghOX5p~U}xEzw&%A1#x3Wn1t#lVPm!&Bfe zckmJff*5}_CShW7I!2~vAua;pU{o%;smX8zeq&m&!M70A^6TEVke|5Hv;E2P3f*HS z6BRgivZV}#`fYKvd|9C{=ybVN!Vq%>`}!N5RcKQS7X~4mMBzZi4z^ge;R4==$9*rkmvow24(Xd3waT zvbDtI%Y*M`{f>IA?F<}rLT>EWT>a`;cb^OG#;Fz7`T#>nwr~xri0M43Sl^4fhJi4b zF2Rx?N_u!btgHuSlUmMT3FoFexx!G0c{+I5gwYH(gREjrA@)oW9FuqzP2hBWch79q_=mgV9BSERd+ta+w66HOSKd>R5?bPz z$sq<+xS5;U!kqPwj#EZ-St;0MQNuvNEFLUqwrbkM?-Uzl2uGBd1Vi?&0t=CsRl~`h zgqC)Vahw2s&{#}PM5g_`0f<5XT2>^f(R*wI8 zRTnFBb5|GE-@n*@bFcNKcoe3rQ%*LM=Sr4C@R15p^&$v&-`?~(v`cZu*n85VWnxh8fFnJtDm6yrunWokG z(%6izlLZPLrdgd0QLMmA&?PO}@OS?qS@-!zEc#c7Fse^l0s}KO_6O6k#64{aZxcjE zQ!K*cx+hP&CuXBVh^CLKo7N0itI>=>S_#IW_RwI5CMU^#E`Ac(9x6HMTXLw!D}B&D z^$NKc(i-_#2gz(y1c_Qs^T#`OZ;S$s1N4|wG=%Y1Z4iT2f~>73 zs-*FAaoVj7*S?7HvK#l={+%-lF2#hfc^1l2*q~5r(Ie|c*f*N5LkwrWMJi2Hev93L zg81b8`$o2&a2m4rmmXIfw4Tu2FtcZ0e1%;l@7Pd%+)&vkG0};)>Y9az*&o)n*zkFK zAu5a~4DJbgdxjtoIYB|PYNF*i0k&dW&HBYWm%I`RB92tkXjSH&#_nwR9?wl)4^k@4 zDMC+Gj7km!=wldA&IfTW?_u>f+^hPga*2wM~w>H`GDD_5TCv@w#3>cpvJCed$*ZelnGGZZS8nnK> zn}9JyOc0yWy69<-W@>bOhe3B07dkr{E&QJBGo&UeJ6vlL=RV~*Yas!Lb6<=<0RcKD z=w}&4NZc^Fsi3lV>Mf4&f?{&{45*q?WA8(XDI8owK2zZG=Y6ISK8_HT zT0M>kjMO@g$c@yJgYHw|UWt#?I)N`Xct>PbSs#iW)DYSg&vLubuyMvp7de_+`8^Lz&ezIBf!06JSPPqaDw%#%dt-gXH!MN?rrhdZ5!Y)H<* zH6qH#$=FED;c~hwsK~`OfJ`?97XETEIV8I8YnOzz{(6aKcV*05vv6of=_S5av0FVl z6oKs>>~S|5@41J(>XwvmksWjnU_mt5fiO{)Mq(XqU@0!Cu<*Dl;)L7DJcQfxZ{PI= zE8RzLJKefnOue(Hm0>1P+t+DqiY%7kxq5`;n;$!daym&XRzI8n6ZC>J9{4Ib+s zLPkGbOj$gL(CAI9vykZ2rJp+K2rjKNWTQ^^aaJ2$xJHD}78#Qfd-4~2Y*In6j?i4U ziqJfurM}#>zW(EJstg&!B*`Aaek=*!B0b2!T5% zkd*6gNulBNAg3)p@5dfWp3GsAVmyP!CYCmcAiQ;e7)kXMISDEg6tt2hHTn67nnG~G z{W72wN?|&3p=}~{i`TnVW9ag?H)LE|Pubdsh4*utBPUtb!iB}HNQMa7AajlQNTQ~R zIg^BC8P)*dOmP4)PO!Io`pr4-S}0LSd6a%7)A@m}3XH_u9sr1mGr2|t?{QUc7Ry0F zcVZl)FcH5tAVa>@h8?j4P! zn3YCSn$B)&!M95ywv39}Ryf;S(RiNXKg=8ZPG>DbGO= z>%DjaF;r4W^xouj_Y<)X^e@Vd-Xyz@Z^7OS&pndkC{2%A+EfY`f!s!L%7+5 z(x8r|P@~P*HGC7`{$OJu##~4k*o=E+fM5n8CLeIZ=y=;s!f5d-L!h@1;LGgZJ`9oXC9iHoth+?jW}%L?qTMNaYisqC}V*xH;~^nJ)F-& z2P_oeJvDcNK9JMRVDrNssPvHAGNR30;G$QK_S|AYAsw1DzD1|?v_yk5{JBVnAJb;g z`9RdI`-TQBJKEk+W6=Aej?^A+yy)3l^y6B%1B%2s>M~zv{lW3@pLIwUkWz00++-6Y_^r|Qd&G3LGPgHp z{r&uVusqdP021+_ci0d#( zL1o7aDSXxGR(0&ni=rhvQ?g@7iYm-^<}IGbC7D#%yfayS&g$Uza~h_e+!SPlw)?gw zkl&BVyzxzG1RyM)caQ_r)5^YskZ?YfFF!Pmaj0ZvUa4cRfhnoBq3{OM=5zEQRoD8) z#}|*=-r&yfJ_s+*`zEo%p&!)f=R`$+1ZF_!1`!e|+aQu#Etu(7F;lk z$8?XaYAle~XGZ7bD{~v{-u*sihx*#_ye_Umu!;Q4Fy@zKt15TAa%M79X?M`MTfVSW z<#=)`-B1`s>m0Ue%7}VPN{((c8XzYCTQ0%NIc19-ku1G6A_0STo#cZ_X^|KaKEc^l zt|${qDS;4%W5RIki*}ficaqL0K|dd#yXlLyjo7m_fsV(h(zS#YF>A9Cp_hvj|IXH( zr>m2@$us{%6<qGm9cVK3O?54`2Bu9=VlH%Lpb-h^xQT&xK69O7ej+wj zoWN_b9)pF{Jc++%v3eAs&z-upwZ#>)ns`iR% zs#Fp~x#oIK;C1(6&6ms&Ex$Ed2+N?DLia?El?Yya4k}8+GF?rR%#<_b2s0N|`k~dZJvGx^yYJH5 zCFVH$APO0KeS?h{SBtT_-{+{z7I28oWzxI%U1D0?`hlj|dos)e)|h9MWxW`JJDI<` z)twVmH|kzwp5NfoPUzRU1Qlv-txGt3&$af#>2=epQX(z+0mc3J;%#HlkUE(ir+^CU z#WK0_aGg~l=<^Yw5YAcpB75op2$4)n+?C^i?CP$?WvY#Acp&48gy&RXE;zA!AUOcX zKC*dgFk5LxwO>ZLWv(bXSrYyp7^QOf^;H+wlBMyw%U7GS&aq($GVNGRqJG|MBn}xK zU2{_Pl7%emg2%N`2>Dy}Xf~R<7%g}FX&q#7Yy-0pgQaw>X*Vq=gHpo~8;t%Q93veJ z99}|C$DHH)7_aqFiP;c3RCUm0qaTJo4u~`6n!!?y6ROOylYKIPW5(Y6WMr>&ey{Wv zGrlpJZD#y+k8Ce~s7H3z{@$SWz!&|nIS!Q;lNus&Zg;IZ6MF1z(6dXNhN-WEHIuOwjJq<9r2Qh+x4fiL($yAx* z&1l=_LqyZ`ond7Cgq0c2MzYX)=X1`$FzD}8NED1$XOhMlvsIq-B`$QNGF(y9ZFy;C z*}dE!aQ6?3eWt&R1VS<6ElysE^G3c4^xY}*_A1rL=9I0gNXIQNDLbN>ZPMIDDIcM* z(N2Eb<7Zc^|#{9W`Q*u?}Clc}A^AdKix7q>TOS#JQ-EM_x-0P%6gJ zYx_N;$WYdpjyf6cfqXm4H4uOQ49U(FX(%6#r{yh!l%KmdQ5A4=Ds=+}uRd3b2i(Q| zmw4bGisicszQTeE0HFL44_sV5?aW<%E1SkN$75Gs{}u@Z;M;6(Oyz6|5`sM3VW4HB zAX{O)3aLkE#N#2QfVb&hT2$Pi9~K>3$jNQT zHWq7`OKRP3ce7fCDB94e_eQawd=gjQnl&I^VRClMMZPYO`doX~si4zfyz3ZFTOk{>!a0qO3S=O+tuSIpRbG(|8r1-nrSG&l?9Qb*&)KHU_nRioX?5uG zxRD>jGJeU4E{mBCt@x7GuI)^I5d<+ef#hiX-hj%tJW-d@;wCmL16Qp+Pt7uC0YhC1 z$r;b#v=5c#HbeC4ipw*1=K-$6{W3iRQYJyS>_|de4WUY>9No4`4I7~PDriZ7W&KL8 z6EY00l*w8|t0}EJG91K24~;dWCi+TpqQX%x(O`Sj(BJ3B^^$C5wO!za-wxH3ZP=Mu zZ4tU}`=J$;P&SjcRq4xWh8~MrQtxEwrvVRsxTcBzVl~^I1@WJBrUJsW8T?v9n6f@n zRFlRgC_9--P<>9k`M&ots~AUxeMFOJq@B4q(J6%emnI+Zab3A2k{}yk(t-&@7He?w0mR=14QIf8K2(e z1-^u;BE~wTBw@3{3@Tb~xec-b8eoi1byBMg%b?cu%`e_(EgYkCL4~_MJA?<=;@>_z z$fX!br?$}$Pe8>-;y!TUuu(r@95RTqH7@9q65V!}7wa~DIYvMynK=tgyz_3H1#T4? z6Y2B0DjiyWZc@H$Fe434j=P46h|N29)Ki8%e#6v8)+Yn%kZ8Lx*xnCwr7_`$d5=rH zc$dRMI$8CZ_ufgLHDXMO^@;x+jb`H|@`okdfXvtX#a9SpakX)atf+}qki8H;Uc>5# ztH_OD*uo87P&Ix!Jvvg6Lf`OaFc5z}5{rF+1bCY{uPQ9aRj2Pmelwe!NA+5+y3=|n zOU&yO@%wo&xv{0eTaRX2Q-sX#zM<$^v-}N^W!`iax8G54-LQN;k%a>V~Bnb@VU{I?k?VOKUjk*?sMm$)-Wr;nn|C&&AxKRGX)5kOU@pdjt z<(rYXxB%)wsvExE7%S`5;>}vrhIHy9p5C|dCir)@tZ5C%!hqe)Q^2!VXG-35K{(Li z4Zu5E=$7*C{b7rnu#=EL#Q9vdbmG*6#AIi5&=2*raLUsyP7w&b!K;Ul2q?lJdL1n3 zA1UR`57V$z;883e4FG`sA2(oS>}+oK*45eC z!SZ)+FsEbqc0~i%-!kmXagenOnFz}*W68QZhG|qXidi5gePCtD6ckF5vt zng{MO!X4@AQ}q=`=^*~&RuAK$a5L^?1A4lb4PBg#1IOo`Hs#vrw@)HIzdGk)P1#VKtpk3FegL_u=7T zEI;bhq;GQHRpk(Fx?3%VBiigo1u3pDr?UKjr1YX;Gl6bi4aMlhz`sb;Z5`HI;`$`y z-juR|JH8iuxs|J{+Wx+{woTvHNmZNCOHoLNj#TKXUf9o?1^Z%)vT5_a|FwaRW7BpP zPTl<{cSMHHr1OW=Y-OUl{m(1kHJ)vDJ>20~9lYiaG{#p%lF@`HyY3pxU#=IsA0Lw+ zNg`{47O*;qeq$1gD6=04xQKuA44uS&yUA1deA(+l{`@`26*WCK30FZtt)>2 zIfT?_p(9*09v?Fr|HE`r*8s1kWkL|?u_rxDDFR>7=yLrjlA_{KoQyR=i+<^BLP|zL z{WDq^tg<=68;n3XvOq*>{G?|=_iiloJaO_}UdeG1^oOBf>v!1C@=oGRJOwXO1tS$lU>>7K(+UxA}4RzNjS2;^j_`JfzCy!3|AfL1a-Gom1 z6hz9L=Av*vZQpi(b5YLR*61(+RR3&HdJz+Y3nUarSBFXxFem6ZXwA)AdF~LBb3Utnct&GE zMbm0$GS9X1K5{F_^6p}W5`a8LFkdXIOM6d0@%V= zAD00q=rBt)xOU=-Y4Xz0T)QExW4rpk#I$(fdc8Ntm?Ds)N;=A*K*;E}_}N`LL1JP% zK^v|%3$YXZO%$xN_lYT0OlHSeRv%fRk0`3&3}oLuEDqoY!au-Ou!|$7pAhi90$IE5 zM%VN!=r_$zTDMhu$!eHMC^tpZ41HCr#kr+BrO}$I2o57Of#yT%w57s20@-w7!nD(I zTYPk?rYSZhW~HJt+0^mTv(skCYmnYXI808H+!-_LY_Ng#^4{Fgs%RQ~9`zZSlAVlF z<7eK07P02bS}@`%AmBW#MP!7Dp{QaVi6Yllu}*J;@U9XLqWhtrostw(8AvKTsB4&^ zVzGq);T<{hbu=u6LS=L$4uZgfVCRTYG08dVmErk-^Dqm)ex-Yc?(wx9L8pT4VvX1! z#W39gu7LEaN@T~xwi%^sTT|4=>NmBJg- zS*DO{ZHF!pt+cnGR(QSo49U>xYrMYxl#g+I{yd)HT_Um7uGH4NFh2WfmS6BrIi{+- z#@YuW3rSG_Y0>I=`-F{uuuf#>Y+=b&v#Lb+KH`*(84f-PSl2_=agi#cW;Epee{u(qz|szh<`Ri1CGF5>I0D;+ z1SxaMhts-3Br`GL>$+m+sow?RRH=4ri92RAn8n-TIG$S*SI8YlBvW8 zEn@EZ;BU^3!AK3AxXSe=PP!;qMsxPi+{uX;ujDSfI627GqG>7=V{j?^w{i;NS1D7K z_@o^|^_W?=yZ}mo`=9d@am^tj5r_q zXpACh;79o<5-l9iOE_l;!}&emUI8L$`Iu&JycKA6XESu>bSH*fZqi7Xr+ z+#p=38n~1<^PX6*-4FXTe2BW5*WE}vVWf4gU>fxLz-8OrNDHD=!)<0(OAq(86LZ3< z32de))r=u%nvAw-&a8DbFoBJSLU;@>0hhfZ<8xF9MC5YpW+)S~bfFcIHrXHO(JB>> z{KIo#JvWJ$;owx_?ohh(taK%+*R(L|wWY={nvV34s_cI@@7YQCA?9#$ls1P|K^gZJ z$@u!;l8f_4KgXxb#vSi8?H})7On)4dxh43(xx8iGt7^tzo~7h8S#|*3 zO_0UwmN%pHNY_Jvl0^|SgaG4i&_ugB8JkuzO8-WlK-BN4GKVMx9*>*v(=0MOGm)Bf zO@Ls&uk`3u=%lv91V3;KH3#PEr+SQ%4PI%n{VKnqe5fgia<6t2E2V?%4BA#c zAK;`5@+z84C*;4^B-uaL|sNP-E7}{ z)pKgUTy`TiOA$mn1r_3I2kDta6|ug4m}l}D>S~I6qgBqqGh7Oc4p zY}1K(0~{tr6V$>4MKB)hVe4KVj$TyV?nr`bH!Lj2z>%yqIwlHQXy#PW@S10@sm+sY z?`}Mr7=?7cwSEc;_YuIgk}SKsv@DfMetfe?`RTJr^9s|B^*+9z#Q zI#u%sTD?uIAE}l8XokhwgZ5Fq7&h%J`GqZ$ z^6BqtG2kmtU_C|utDYJ=I{sHp!TR~11C*cy<|Lwr-pQ_#UuN^egsAS}ll%2SN*3bY z4y1G8R=rx1m~+N`%@o%R!RP>mIcSs+kpRi)#(5<@`RNlgDy~cB9D3dbi)pXe2&Uum z!N53&8@JHfvZb8lp0jy-a5OV{EmTVj`9QZO`jn{RP)~n!a>RVZRf$4cIWO5#yxKjR zrmTIMlOeWrZ_R?ci{nt!tn0^K$nL#3pgN<(SH4)ApP#M2zwgESTs#^XP{>=sU|TQ# zrLc{S|Nan3Q5l!8V$=5x`Wp1LK3j8A>E@G$VtuWn!8gIC@0u51p5lb2(>xh zGO>I#Ij%eGmDdUm??PZ{O&buU`KT%^Ds7jSH86sG{5`$AeeXSda6#7&UsImu{p{WL zs`YbBd~4Vbd1bX|L4@__tWhRnenKl5i4 z`BxQAY1g}E0$)J|t1y^Z{1;dI-o+JY|6eWs9~}k&3gVR%dPV=>?4A17)n)FRDkRMK zVD|+FHQdG7EsNF?)n?jYytL}pWI+OhOuIPasy z(nr>1MS7@D#`5~!5~)2D=O)f5rp`|H#WC(REu-!t1Kye3;Y?$JFw;RYOgmx-ViUD& zV|b#Y8+JoC@kd}j?0@1p1SB)KRr2oy_CNRZk6-^nXIEADyMVuQYX2&r3f!Lk3&ZwT z;IGWWKcQP-X3Q@{w1puxPeh2@5C|SSC`IU(Crz9Ta|9y#n&~kp2^6PN& zPbt>mStWQWzm6(@74T~}`%eL$;CUxlz@NSCU!lKt!2W~=y!r$BYd`E)3BRVTe@Z|B zch$fT|63CKEBfy#;h$Il;0%oZM}qh({O^(aukcj*zrg Date: Sat, 8 Jan 2022 14:24:52 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E7=BA=A2=E6=97=97=E4=B8=80=E6=B1=BD?= =?UTF-8?q?=E8=BD=BF=E8=BD=A6=E5=8F=91=E8=BF=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ReportServices/ReportMakeService.cs | 67 +++++++++++++++++++ .../SettleAccount.Application.xml | 21 ++++++ .../SettleAccountJobModule.cs | 31 ++++++++- 3 files changed, 118 insertions(+), 1 deletion(-) diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs index cd2bfa3e..c137b53d 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs @@ -753,6 +753,73 @@ namespace Win.Sfs.SettleAccount.Reports.ReportServices } + /// + /// H平台发运核对输出 + /// + /// + /// + [HttpPost] + [Route("HQHShippingExportService")] + [DisableRequestSizeLimit] + public async Task HQHShippingExportServiceMake( + HQKanbanRequestDto input + ) + { + List customConditionList = new List(); + customConditionList.Add(new CustomCondition() { Name = "Version", Value = input.Version }); + customConditionList.Add(new CustomCondition() { Name = "BeginTime", Value = input.Begin }); + customConditionList.Add(new CustomCondition() { Name = "EndTime", Value = input.End }); + var _taskid = await _service.ExportEnqueueAsync("H平台发运核对输出", ExportExtentsion.Excel, input.Version, null, CurrentUser, typeof(HQHShippingExportService), customConditionList, (rs) => + { + }); + return _taskid; + } + + /// + /// F平台发运核对输出 + /// + /// + /// + [HttpPost] + [Route("HQHShippingExportService")] + [DisableRequestSizeLimit] + public async Task HQFShippingExportServiceMake( + HQKanbanRequestDto input + ) + { + List customConditionList = new List(); + customConditionList.Add(new CustomCondition() { Name = "Version", Value = input.Version }); + customConditionList.Add(new CustomCondition() { Name = "BeginTime", Value = input.Begin }); + customConditionList.Add(new CustomCondition() { Name = "EndTime", Value = input.End }); + var _taskid = await _service.ExportEnqueueAsync("F平台发运核对输出", ExportExtentsion.Excel, input.Version, null, CurrentUser, typeof(HQFShippingExportService), customConditionList, (rs) => + { + }); + return _taskid; + } + + /// + /// M平台发运核对输出 + /// + /// + /// + [HttpPost] + [Route("HQMShippingExportService")] + [DisableRequestSizeLimit] + public async Task HQMShippingExportServiceMake( + HQKanbanRequestDto input + ) + { + List customConditionList = new List(); + customConditionList.Add(new CustomCondition() { Name = "Version", Value = input.Version }); + customConditionList.Add(new CustomCondition() { Name = "BeginTime", Value = input.Begin }); + customConditionList.Add(new CustomCondition() { Name = "EndTime", Value = input.End }); + var _taskid = await _service.ExportEnqueueAsync("M平台发运核对输出", ExportExtentsion.Excel, input.Version, null, CurrentUser, typeof(HQMShippingExportService), customConditionList, (rs) => + { + }); + return _taskid; + } + + diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml b/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml index 15663265..2eb0f544 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml @@ -3171,6 +3171,27 @@ + + + H平台发运核对输出 + + + + + + + F平台发运核对输出 + + + + + + + M平台发运核对输出 + + + + 红旗F平台导入 diff --git a/src/Modules/SettleAccount/src/SettleAccount.Job/SettleAccountJobModule.cs b/src/Modules/SettleAccount/src/SettleAccount.Job/SettleAccountJobModule.cs index 716ae44c..88b662b9 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Job/SettleAccountJobModule.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Job/SettleAccountJobModule.cs @@ -148,6 +148,7 @@ namespace Win.Sfs.SettleAccount { return implementationFactory.GetService(); } + //红旗、一汽轿车结算报表 if (key.Equals(typeof(HQFSettledDetailDiffExportService).FullName)) { return implementationFactory.GetService(); @@ -156,8 +157,36 @@ namespace Win.Sfs.SettleAccount { return implementationFactory.GetService(); } + if (key.Equals(typeof(HQMSettledDetailDiffExportService).FullName)) + { + return implementationFactory.GetService(); + } + if (key.Equals(typeof(HQMSharePartSettledDetailDiffExportService).FullName)) + { + return implementationFactory.GetService(); + } + if (key.Equals(typeof(HQHSettledDetailDiffExportService).FullName)) + { + return implementationFactory.GetService(); + } + if (key.Equals(typeof(HQHSharePartSettledDetailDiffExportService).FullName)) + { + return implementationFactory.GetService(); + } + //红旗、轿车发运报表 + if (key.Equals(typeof(HQMShippingExportService).FullName)) + { + return implementationFactory.GetService(); + } + if (key.Equals(typeof(HQHShippingExportService).FullName)) + { + return implementationFactory.GetService(); + } + if (key.Equals(typeof(HQFShippingExportService).FullName)) + { + return implementationFactory.GetService(); + } - else { From 7cd478a61ed1d7b2534180abc5a345652524e69a Mon Sep 17 00:00:00 2001 From: Administrator Date: Sat, 8 Jan 2022 14:30:23 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Logs/log-20220108.txt | 855 ++++++++++++++++++ .../HQFSettledDetailDapperRepository.cs | 2 +- 2 files changed, 856 insertions(+), 1 deletion(-) diff --git a/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Logs/log-20220108.txt b/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Logs/log-20220108.txt index 30bc68b6..05cb392c 100644 --- a/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Logs/log-20220108.txt +++ b/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Logs/log-20220108.txt @@ -652,3 +652,858 @@ ORDER BY [a].[Id]" 2022-01-08 14:00:14.262 G Request finished HTTP/1.1 GET http://localhost:44378/swagger/index.html - - - 200 - text/html;charset=utf-8 49.4587ms 2022-01-08 14:00:14.378 G Request starting HTTP/1.1 GET http://localhost:44378/swagger/v1/swagger.json - - 2022-01-08 14:00:15.641 G Request finished HTTP/1.1 GET http://localhost:44378/swagger/v1/swagger.json - - - 200 - application/json;charset=utf-8 1263.7065ms +2022-01-08 14:25:26.517 G Starting web host. +2022-01-08 14:25:35.353 G User profile is available. Using '"C:\Users\Administrator\AppData\Local\ASP.NET\DataProtection-Keys"' as key repository and Windows DPAPI to encrypt keys at rest. +2022-01-08 14:25:35.452 G Loaded ABP modules: +2022-01-08 14:25:35.453 G - Win.Sfs.SettleAccount.SettleAccountHttpApiHostModule +2022-01-08 14:25:35.453 G - Win.Sfs.SettleAccount.SettleAccountApplicationModule +2022-01-08 14:25:35.454 G - Win.Sfs.SettleAccount.SettleAccountJobModule +2022-01-08 14:25:35.454 G - Win.Sfs.SettleAccount.SettleAccountDomainModule +2022-01-08 14:25:35.454 G - Volo.Abp.Domain.AbpDddDomainModule +2022-01-08 14:25:35.455 G - Volo.Abp.Auditing.AbpAuditingModule +2022-01-08 14:25:35.455 G - Volo.Abp.Data.AbpDataModule +2022-01-08 14:25:35.456 G - Volo.Abp.ObjectExtending.AbpObjectExtendingModule +2022-01-08 14:25:35.456 G - Volo.Abp.Localization.AbpLocalizationAbstractionsModule +2022-01-08 14:25:35.456 G - Volo.Abp.Validation.AbpValidationAbstractionsModule +2022-01-08 14:25:35.457 G - Volo.Abp.Uow.AbpUnitOfWorkModule +2022-01-08 14:25:35.458 G - Volo.Abp.EventBus.Abstractions.AbpEventBusAbstractionsModule +2022-01-08 14:25:35.459 G - Volo.Abp.Json.AbpJsonModule +2022-01-08 14:25:35.459 G - Volo.Abp.Timing.AbpTimingModule +2022-01-08 14:25:35.460 G - Volo.Abp.Localization.AbpLocalizationModule +2022-01-08 14:25:35.460 G - Volo.Abp.VirtualFileSystem.AbpVirtualFileSystemModule +2022-01-08 14:25:35.461 G - Volo.Abp.Settings.AbpSettingsModule +2022-01-08 14:25:35.461 G - Volo.Abp.Security.AbpSecurityModule +2022-01-08 14:25:35.461 G - Volo.Abp.MultiTenancy.AbpMultiTenancyModule +2022-01-08 14:25:35.462 G - Volo.Abp.Threading.AbpThreadingModule +2022-01-08 14:25:35.462 G - Volo.Abp.EventBus.AbpEventBusModule +2022-01-08 14:25:35.463 G - Volo.Abp.Guids.AbpGuidsModule +2022-01-08 14:25:35.463 G - Volo.Abp.ObjectMapping.AbpObjectMappingModule +2022-01-08 14:25:35.463 G - Volo.Abp.ExceptionHandling.AbpExceptionHandlingModule +2022-01-08 14:25:35.464 G - Volo.Abp.Specifications.AbpSpecificationsModule +2022-01-08 14:25:35.464 G - Win.Sfs.SettleAccount.SettleAccountDomainSharedModule +2022-01-08 14:25:35.465 G - Volo.Abp.Validation.AbpValidationModule +2022-01-08 14:25:35.465 G - Win.Sfs.SettleAccount.SettleAccountApplicationContractsModule +2022-01-08 14:25:35.466 G - Volo.Abp.Application.AbpDddApplicationContractsModule +2022-01-08 14:25:35.467 G - Volo.Abp.Authorization.AbpAuthorizationModule +2022-01-08 14:25:35.468 G - Volo.Abp.Authorization.AbpAuthorizationAbstractionsModule +2022-01-08 14:25:35.468 G - Volo.Abp.AutoMapper.AbpAutoMapperModule +2022-01-08 14:25:35.469 G - Volo.Abp.Dapper.AbpDapperModule +2022-01-08 14:25:35.469 G - Volo.Abp.EntityFrameworkCore.AbpEntityFrameworkCoreModule +2022-01-08 14:25:35.470 G - Win.Abp.Snowflakes.AbpSnowflakeGeneratorModule +2022-01-08 14:25:35.471 G - Volo.Abp.Http.Client.IdentityModel.AbpHttpClientIdentityModelModule +2022-01-08 14:25:35.471 G - Volo.Abp.Http.Client.AbpHttpClientModule +2022-01-08 14:25:35.472 G - Volo.Abp.Http.AbpHttpModule +2022-01-08 14:25:35.472 G - Volo.Abp.Http.AbpHttpAbstractionsModule +2022-01-08 14:25:35.474 G - Volo.Abp.Minify.AbpMinifyModule +2022-01-08 14:25:35.474 G - Volo.Abp.Castle.AbpCastleCoreModule +2022-01-08 14:25:35.475 G - Volo.Abp.IdentityModel.AbpIdentityModelModule +2022-01-08 14:25:35.475 G - Volo.Abp.Caching.AbpCachingModule +2022-01-08 14:25:35.476 G - Volo.Abp.Serialization.AbpSerializationModule +2022-01-08 14:25:35.477 G - Volo.Abp.Identity.AbpIdentityHttpApiClientModule +2022-01-08 14:25:35.477 G - Volo.Abp.Identity.AbpIdentityApplicationContractsModule +2022-01-08 14:25:35.478 G - Volo.Abp.Identity.AbpIdentityDomainSharedModule +2022-01-08 14:25:35.478 G - Volo.Abp.Users.AbpUsersDomainSharedModule +2022-01-08 14:25:35.479 G - Volo.Abp.Features.AbpFeaturesModule +2022-01-08 14:25:35.479 G - Volo.Abp.Users.AbpUsersAbstractionModule +2022-01-08 14:25:35.480 G - Volo.Abp.Application.AbpDddApplicationModule +2022-01-08 14:25:35.481 G - Volo.Abp.GlobalFeatures.AbpGlobalFeaturesModule +2022-01-08 14:25:35.482 G - Volo.Abp.PermissionManagement.AbpPermissionManagementApplicationContractsModule +2022-01-08 14:25:35.483 G - Volo.Abp.PermissionManagement.AbpPermissionManagementDomainSharedModule +2022-01-08 14:25:35.484 G - Volo.Abp.AspNetCore.Mvc.AbpAspNetCoreMvcModule +2022-01-08 14:25:35.484 G - Volo.Abp.AspNetCore.AbpAspNetCoreModule +2022-01-08 14:25:35.485 G - Volo.Abp.ApiVersioning.AbpApiVersioningAbstractionsModule +2022-01-08 14:25:35.485 G - Volo.Abp.AspNetCore.Mvc.AbpAspNetCoreMvcContractsModule +2022-01-08 14:25:35.486 G - Volo.Abp.UI.Navigation.AbpUiNavigationModule +2022-01-08 14:25:35.487 G - Volo.Abp.UI.AbpUiModule +2022-01-08 14:25:35.488 G - Win.Sfs.SettleAccount.SettleAccountEntityFrameworkCoreModule +2022-01-08 14:25:35.488 G - Volo.Abp.PermissionManagement.EntityFrameworkCore.AbpPermissionManagementEntityFrameworkCoreModule +2022-01-08 14:25:35.490 G - Volo.Abp.PermissionManagement.AbpPermissionManagementDomainModule +2022-01-08 14:25:35.490 G - Volo.Abp.SettingManagement.EntityFrameworkCore.AbpSettingManagementEntityFrameworkCoreModule +2022-01-08 14:25:35.491 G - Volo.Abp.SettingManagement.AbpSettingManagementDomainModule +2022-01-08 14:25:35.492 G - Volo.Abp.SettingManagement.AbpSettingManagementDomainSharedModule +2022-01-08 14:25:35.492 G - Volo.Abp.AuditLogging.EntityFrameworkCore.AbpAuditLoggingEntityFrameworkCoreModule +2022-01-08 14:25:35.493 G - Volo.Abp.AuditLogging.AbpAuditLoggingDomainModule +2022-01-08 14:25:35.494 G - Volo.Abp.AuditLogging.AbpAuditLoggingDomainSharedModule +2022-01-08 14:25:35.494 G - Volo.Abp.TenantManagement.EntityFrameworkCore.AbpTenantManagementEntityFrameworkCoreModule +2022-01-08 14:25:35.495 G - Volo.Abp.TenantManagement.AbpTenantManagementDomainModule +2022-01-08 14:25:35.495 G - Volo.Abp.TenantManagement.AbpTenantManagementDomainSharedModule +2022-01-08 14:25:35.496 G - Win.Sfs.SettleAccount.SettleAccountHttpApiModule +2022-01-08 14:25:35.496 G - Volo.Abp.Autofac.AbpAutofacModule +2022-01-08 14:25:35.497 G - Volo.Abp.EntityFrameworkCore.SqlServer.AbpEntityFrameworkCoreSqlServerModule +2022-01-08 14:25:35.497 G - Volo.Abp.AspNetCore.Serilog.AbpAspNetCoreSerilogModule +2022-01-08 14:25:35.498 G - Volo.Abp.BlobStoring.AbpBlobStoringModule +2022-01-08 14:25:35.498 G - Volo.Abp.BlobStoring.FileSystem.AbpBlobStoringFileSystemModule +2022-01-08 14:25:35.499 G - Volo.Abp.BackgroundJobs.Hangfire.AbpBackgroundJobsHangfireModule +2022-01-08 14:25:35.499 G - Volo.Abp.BackgroundJobs.AbpBackgroundJobsAbstractionsModule +2022-01-08 14:25:35.500 G - Volo.Abp.Hangfire.AbpHangfireModule +2022-01-08 14:25:35.575 G Start installing Hangfire SQL objects... +2022-01-08 14:25:35.784 G Hangfire SQL objects installed. +2022-01-08 14:25:35.796 G Starting Hangfire Server using job storage: 'SQL Server: 192.168.0.67@SettleAccountService' +2022-01-08 14:25:35.797 G Using the following options for SQL Server job storage: Queue poll interval: 00:00:15. +2022-01-08 14:25:35.798 G Using the following options for Hangfire Server: + Worker count: 20 + Listening queues: 'default' + Shutdown timeout: 00:00:15 + Schedule polling interval: 00:00:15 +2022-01-08 14:25:35.907 G Starting Hangfire Server using job storage: 'SQL Server: 192.168.0.67@SettleAccountService' +2022-01-08 14:25:35.909 G Using the following options for SQL Server job storage: Queue poll interval: 00:00:15. +2022-01-08 14:25:35.910 G Using the following options for Hangfire Server: + Worker count: 20 + Listening queues: 'default' + Shutdown timeout: 00:00:15 + Schedule polling interval: 00:00:15 +2022-01-08 14:25:36.133 G Server sk-20210819huao:5796:0afa4ed0 successfully announced in 256.028 ms +2022-01-08 14:25:36.133 G Server sk-20210819huao:5796:e9e9b26b successfully announced in 214.6412 ms +2022-01-08 14:25:36.143 G Server sk-20210819huao:5796:e9e9b26b is starting the registered dispatchers: ServerWatchdog, ServerJobCancellationWatcher, ExpirationManager, CountersAggregator, Worker, DelayedJobScheduler, RecurringJobScheduler... +2022-01-08 14:25:36.143 G Server sk-20210819huao:5796:0afa4ed0 is starting the registered dispatchers: ServerWatchdog, ServerJobCancellationWatcher, ExpirationManager, CountersAggregator, Worker, DelayedJobScheduler, RecurringJobScheduler... +2022-01-08 14:25:36.442 G Server sk-20210819huao:5796:e9e9b26b all the dispatchers started +2022-01-08 14:25:36.459 G Server sk-20210819huao:5796:0afa4ed0 all the dispatchers started +2022-01-08 14:25:37.640 G Entity Framework Core "5.0.8" initialized '"PermissionManagementDbContext"' using provider '"Microsoft.EntityFrameworkCore.SqlServer"' with options: "QuerySplittingBehavior=SplitQuery " +2022-01-08 14:25:37.962 G Executed DbCommand ("36"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.057 G Executed DbCommand ("5"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.065 G Executed DbCommand ("4"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.070 G Executed DbCommand ("3"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.076 G Executed DbCommand ("3"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.082 G Executed DbCommand ("4"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.089 G Executed DbCommand ("6"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.100 G Executed DbCommand ("8"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.105 G Executed DbCommand ("3"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.110 G Executed DbCommand ("3"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.115 G Executed DbCommand ("3"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.120 G Executed DbCommand ("3"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.125 G Executed DbCommand ("3"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.131 G Executed DbCommand ("4"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.136 G Executed DbCommand ("3"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.142 G Executed DbCommand ("3"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.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]" +2022-01-08 14:25:38.151 G Executed DbCommand ("3"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.160 G Executed DbCommand ("7"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.164 G Executed DbCommand ("3"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.170 G Executed DbCommand ("3"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.179 G Executed DbCommand ("8"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.189 G Executed DbCommand ("8"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.197 G Executed DbCommand ("5"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.202 G Executed DbCommand ("3"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.207 G Executed DbCommand ("3"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.212 G Executed DbCommand ("3"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.218 G Executed DbCommand ("3"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.225 G Executed DbCommand ("4"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.234 G Executed DbCommand ("6"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.239 G Executed DbCommand ("3"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.247 G Executed DbCommand ("6"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.258 G Executed DbCommand ("8"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.264 G Executed DbCommand ("4"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.282 G Executed DbCommand ("3"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.291 G Executed DbCommand ("5"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.303 G Executed DbCommand ("5"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.310 G Executed DbCommand ("3"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.333 G Executed DbCommand ("18"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.341 G Executed DbCommand ("4"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.355 G Executed DbCommand ("10"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.363 G Executed DbCommand ("3"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.370 G Executed DbCommand ("4"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.376 G Executed DbCommand ("4"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.383 G Executed DbCommand ("4"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.391 G Executed DbCommand ("3"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.405 G Executed DbCommand ("8"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.413 G Executed DbCommand ("4"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.419 G Executed DbCommand ("3"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.426 G Executed DbCommand ("5"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.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]" +2022-01-08 14:25:38.440 G Executed DbCommand ("4"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.455 G Executed DbCommand ("12"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.467 G Executed DbCommand ("9"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.474 G Executed DbCommand ("3"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.480 G Executed DbCommand ("3"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.488 G Executed DbCommand ("3"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.498 G Executed DbCommand ("7"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.505 G Executed DbCommand ("3"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.514 G Executed DbCommand ("5"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.530 G Executed DbCommand ("11"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.540 G Executed DbCommand ("4"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.548 G Executed DbCommand ("3"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.555 G Executed DbCommand ("3"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.562 G Executed DbCommand ("3"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.569 G Executed DbCommand ("4"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.577 G Executed DbCommand ("5"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.590 G Executed DbCommand ("8"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.600 G Executed DbCommand ("6"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.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]" +2022-01-08 14:25:38.614 G Executed DbCommand ("3"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.622 G Executed DbCommand ("5"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.630 G Executed DbCommand ("3"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.637 G Executed DbCommand ("3"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.644 G Executed DbCommand ("3"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.654 G Executed DbCommand ("7"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.664 G Executed DbCommand ("5"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.670 G Executed DbCommand ("3"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.684 G Executed DbCommand ("10"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.694 G Executed DbCommand ("6"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.700 G Executed DbCommand ("2"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.711 G Executed DbCommand ("8"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.722 G Executed DbCommand ("8"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.731 G Executed DbCommand ("5"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.740 G Executed DbCommand ("6"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.754 G Executed DbCommand ("10"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.764 G Executed DbCommand ("6"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.770 G Executed DbCommand ("3"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.776 G Executed DbCommand ("3"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.788 G Executed DbCommand ("9"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.797 G Executed DbCommand ("4"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.805 G Executed DbCommand ("3"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.824 G Executed DbCommand ("14"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.841 G Executed DbCommand ("14"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.850 G Executed DbCommand ("5"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.856 G Executed DbCommand ("3"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.864 G Executed DbCommand ("4"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.869 G Executed DbCommand ("3"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.876 G Executed DbCommand ("4"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.889 G Executed DbCommand ("9"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.896 G Executed DbCommand ("4"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.904 G Executed DbCommand ("4"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.927 G Executed DbCommand ("19"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.938 G Executed DbCommand ("6"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.948 G Executed DbCommand ("6"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:38.956 G Executed DbCommand ("3"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']" +""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId] +FROM [AbpPermissionGrants] AS [a] +WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2)) +ORDER BY [a].[Id]" +2022-01-08 14:25:39.358 G Initialized all ABP modules. +2022-01-08 14:25:39.538 G Now listening on: "http://localhost:44378" +2022-01-08 14:25:39.543 G Application started. Press Ctrl+C to shut down. +2022-01-08 14:25:39.544 G Hosting environment: "Development" +2022-01-08 14:25:39.545 G Content root path: "C:\Users\Administrator\source\repos\Win.Sfs.SmartSettlementSystem.PG\src\Modules\SettleAccount\host\SettleAccount.HttpApi.Host" +2022-01-08 14:25:41.437 G Request starting HTTP/1.1 GET http://localhost:44378/ - - +2022-01-08 14:25:42.553 G Entity Framework Core "5.0.8" initialized '"SettingManagementDbContext"' using provider '"Microsoft.EntityFrameworkCore.SqlServer"' with options: "QuerySplittingBehavior=SplitQuery " +2022-01-08 14:25:42.574 G Executed DbCommand ("3"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" +2022-01-08 14:25:42.667 G Entity Framework Core "5.0.8" initialized '"SettingManagementDbContext"' using provider '"Microsoft.EntityFrameworkCore.SqlServer"' with options: "QuerySplittingBehavior=SplitQuery " +2022-01-08 14:25:42.677 G Executed DbCommand ("4"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" +2022-01-08 14:25:42.807 G Executing endpoint '"Win.Sfs.SettleAccount.Controllers.HomeController.Index (SettleAccount.HttpApi.Host)"' +2022-01-08 14:25:42.886 G Route matched with "{action = \"Index\", controller = \"Home\", area = \"\"}". Executing controller action with signature "Microsoft.AspNetCore.Mvc.ActionResult Index()" on controller "Win.Sfs.SettleAccount.Controllers.HomeController" ("SettleAccount.HttpApi.Host"). +2022-01-08 14:25:42.926 G Executing RedirectResult, redirecting to "/swagger". +2022-01-08 14:25:42.933 G Executed action "Win.Sfs.SettleAccount.Controllers.HomeController.Index (SettleAccount.HttpApi.Host)" in 39.6634ms +2022-01-08 14:25:42.935 G Executed endpoint '"Win.Sfs.SettleAccount.Controllers.HomeController.Index (SettleAccount.HttpApi.Host)"' +2022-01-08 14:25:42.953 G Request finished HTTP/1.1 GET http://localhost:44378/ - - - 302 0 - 1517.2099ms +2022-01-08 14:25:42.968 G Request starting HTTP/1.1 GET http://localhost:44378/swagger/index.html - - +2022-01-08 14:25:43.036 G Request finished HTTP/1.1 GET http://localhost:44378/swagger/index.html - - - 200 - text/html;charset=utf-8 67.7540ms +2022-01-08 14:25:43.175 G Request starting HTTP/1.1 GET http://localhost:44378/swagger/v1/swagger.json - - +2022-01-08 14:25:44.956 G Request finished HTTP/1.1 GET http://localhost:44378/swagger/v1/swagger.json - - - 200 - application/json;charset=utf-8 1780.6057ms +2022-01-08 14:27:24.671 G Request starting HTTP/1.1 POST http://localhost:44378/api/settleaccount/ReportMakeService/HQFSharePartSettledDetailDiffExportService application/json 27 +2022-01-08 14:27:24.719 G CORS policy execution failed. +2022-01-08 14:27:24.721 G Request origin "http://localhost:44378" does not have permission to access the resource. +2022-01-08 14:27:24.724 G Executing endpoint '"Win.Sfs.SettleAccount.Reports.ReportServices.ReportService.HQFSharePartSettledDetailDiffExportServiceMake (SettleAccount.Application)"' +2022-01-08 14:27:24.736 G Route matched with "{action = \"HQFSharePartSettledDetailDiffExportServiceMake\", controller = \"Report\", area = \"\"}". Executing controller action with signature "System.Threading.Tasks.Task`1[System.String] HQFSharePartSettledDetailDiffExportServiceMake(Win.Sfs.SettleAccount.Reports.ReportRequestDto.HQKanbanRequestDto)" on controller "Win.Sfs.SettleAccount.Reports.ReportServices.ReportService" ("SettleAccount.Application"). +2022-01-08 14:27:27.070 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()'. +2022-01-08 14:27:27.072 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()'. +2022-01-08 14:27:27.073 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()'. +2022-01-08 14:27:27.074 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()'. +2022-01-08 14:27:27.076 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()'. +2022-01-08 14:27:27.077 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()'. +2022-01-08 14:27:27.078 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()'. +2022-01-08 14:27:27.079 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()'. +2022-01-08 14:27:27.079 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()'. +2022-01-08 14:27:27.080 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()'. +2022-01-08 14:27:27.081 G No type was specified for the decimal property '"Amt"' on entity type '"BT_Car_Platform"'. 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()'. +2022-01-08 14:27:27.082 G No type was specified for the decimal property '"Price"' on entity type '"BT_Car_Platform"'. 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()'. +2022-01-08 14:27:27.083 G No type was specified for the decimal property '"Qty"' on entity type '"BT_Car_Platform"'. 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()'. +2022-01-08 14:27:27.084 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()'. +2022-01-08 14:27:27.085 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()'. +2022-01-08 14:27:27.086 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()'. +2022-01-08 14:27:27.086 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()'. +2022-01-08 14:27:27.087 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()'. +2022-01-08 14:27:27.088 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()'. +2022-01-08 14:27:27.089 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()'. +2022-01-08 14:27:27.090 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()'. +2022-01-08 14:27:27.091 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()'. +2022-01-08 14:27:27.092 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()'. +2022-01-08 14:27:27.093 G No type was specified for the decimal property '"Qty"' on entity type '"HQ_F_Kanban"'. 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()'. +2022-01-08 14:27:27.094 G No type was specified for the decimal property '"Amt"' on entity type '"HQ_F_Platform"'. 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()'. +2022-01-08 14:27:27.095 G No type was specified for the decimal property '"Price"' on entity type '"HQ_F_Platform"'. 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()'. +2022-01-08 14:27:27.096 G No type was specified for the decimal property '"Qty"' on entity type '"HQ_F_Platform"'. 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()'. +2022-01-08 14:27:27.097 G No type was specified for the decimal property '"Qty"' on entity type '"HQ_H_Kanban"'. 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()'. +2022-01-08 14:27:27.097 G No type was specified for the decimal property '"Qty"' on entity type '"HQ_M_Kanban"'. 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()'. +2022-01-08 14:27:27.098 G No type was specified for the decimal property '"Amt"' on entity type '"HQ_H_Platform"'. 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()'. +2022-01-08 14:27:27.099 G No type was specified for the decimal property '"Price"' on entity type '"HQ_H_Platform"'. 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()'. +2022-01-08 14:27:27.100 G No type was specified for the decimal property '"Qty"' on entity type '"HQ_H_Platform"'. 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()'. +2022-01-08 14:27:27.101 G No type was specified for the decimal property '"Amt"' on entity type '"HQ_M_Platform"'. 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()'. +2022-01-08 14:27:27.102 G No type was specified for the decimal property '"Price"' on entity type '"HQ_M_Platform"'. 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()'. +2022-01-08 14:27:27.103 G No type was specified for the decimal property '"Qty"' on entity type '"HQ_M_Platform"'. 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()'. +2022-01-08 14:27:27.104 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()'. +2022-01-08 14:27:27.104 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()'. +2022-01-08 14:27:27.105 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()'. +2022-01-08 14:27:27.106 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()'. +2022-01-08 14:27:27.107 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()'. +2022-01-08 14:27:27.108 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()'. +2022-01-08 14:27:27.109 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()'. +2022-01-08 14:27:27.110 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()'. +2022-01-08 14:27:27.111 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()'. +2022-01-08 14:27:27.112 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()'. +2022-01-08 14:27:27.112 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()'. +2022-01-08 14:27:27.113 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()'. +2022-01-08 14:27:27.114 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()'. +2022-01-08 14:27:27.115 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()'. +2022-01-08 14:27:27.115 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()'. +2022-01-08 14:27:27.116 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()'. +2022-01-08 14:27:27.117 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()'. +2022-01-08 14:27:27.118 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()'. +2022-01-08 14:27:27.119 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()'. +2022-01-08 14:27:27.120 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()'. +2022-01-08 14:27:27.120 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()'. +2022-01-08 14:27:27.121 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()'. +2022-01-08 14:27:27.123 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()'. +2022-01-08 14:27:27.124 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()'. +2022-01-08 14:27:27.125 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()'. +2022-01-08 14:27:27.126 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()'. +2022-01-08 14:27:27.126 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()'. +2022-01-08 14:27:27.127 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()'. +2022-01-08 14:27:27.128 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()'. +2022-01-08 14:27:27.129 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()'. +2022-01-08 14:27:27.130 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()'. +2022-01-08 14:27:27.130 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()'. +2022-01-08 14:27:27.131 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()'. +2022-01-08 14:27:27.132 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()'. +2022-01-08 14:27:27.133 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()'. +2022-01-08 14:27:27.134 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()'. +2022-01-08 14:27:27.135 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()'. +2022-01-08 14:27:27.135 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()'. +2022-01-08 14:27:27.136 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()'. +2022-01-08 14:27:27.137 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()'. +2022-01-08 14:27:27.138 G No type was specified for the decimal property '"Qty"' on entity type '"WmsHQFKanbanOutPutDetial"'. 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()'. +2022-01-08 14:27:27.139 G No type was specified for the decimal property '"Qty"' on entity type '"WmsHQFSharePartOutPutDetial"'. 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()'. +2022-01-08 14:27:27.140 G No type was specified for the decimal property '"Qty"' on entity type '"WmsHQHKanbanOutPutDetial"'. 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()'. +2022-01-08 14:27:27.141 G No type was specified for the decimal property '"Qty"' on entity type '"WmsHQHSharePartOutPutDetial"'. 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()'. +2022-01-08 14:27:27.142 G No type was specified for the decimal property '"Qty"' on entity type '"WmsJitOutPutDetial"'. 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()'. +2022-01-08 14:27:27.143 G No type was specified for the decimal property '"Qty"' on entity type '"WmsKanbanOutPutDetial"'. 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()'. +2022-01-08 14:27:27.144 G No type was specified for the decimal property '"Qty"' on entity type '"WmsSharePartOutPutDetial"'. 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()'. +2022-01-08 14:27:27.145 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()'. +2022-01-08 14:27:27.145 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()'. +2022-01-08 14:27:27.146 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()'. +2022-01-08 14:27:27.147 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()'. +2022-01-08 14:27:27.148 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()'. +2022-01-08 14:27:27.149 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()'. +2022-01-08 14:27:27.150 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()'. +2022-01-08 14:27:27.150 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()'. +2022-01-08 14:27:27.151 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()'. +2022-01-08 14:27:27.152 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()'. +2022-01-08 14:27:27.153 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()'. +2022-01-08 14:27:27.154 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()'. +2022-01-08 14:27:27.155 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()'. +2022-01-08 14:27:27.155 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()'. +2022-01-08 14:27:27.156 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()'. +2022-01-08 14:27:27.157 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()'. +2022-01-08 14:27:27.158 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()'. +2022-01-08 14:27:27.159 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()'. +2022-01-08 14:27:27.160 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()'. +2022-01-08 14:27:27.161 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()'. +2022-01-08 14:27:27.162 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()'. +2022-01-08 14:27:27.162 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()'. +2022-01-08 14:27:27.163 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()'. +2022-01-08 14:27:27.164 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()'. +2022-01-08 14:27:27.165 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()'. +2022-01-08 14:27:27.166 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()'. +2022-01-08 14:27:27.167 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()'. +2022-01-08 14:27:27.167 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()'. +2022-01-08 14:27:27.168 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()'. +2022-01-08 14:27:27.169 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()'. +2022-01-08 14:27:27.170 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()'. +2022-01-08 14:27:27.171 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()'. +2022-01-08 14:27:27.172 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()'. +2022-01-08 14:27:27.174 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()'. +2022-01-08 14:27:27.175 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()'. +2022-01-08 14:27:27.176 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()'. +2022-01-08 14:27:27.177 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()'. +2022-01-08 14:27:27.178 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()'. +2022-01-08 14:27:27.179 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()'. +2022-01-08 14:27:27.181 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()'. +2022-01-08 14:27:27.182 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()'. +2022-01-08 14:27:27.183 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()'. +2022-01-08 14:27:27.184 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()'. +2022-01-08 14:27:27.185 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()'. +2022-01-08 14:27:27.186 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()'. +2022-01-08 14:27:27.187 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()'. +2022-01-08 14:27:27.188 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()'. +2022-01-08 14:27:27.189 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()'. +2022-01-08 14:27:27.190 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()'. +2022-01-08 14:27:27.190 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()'. +2022-01-08 14:27:27.191 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()'. +2022-01-08 14:27:27.192 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()'. +2022-01-08 14:27:27.193 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()'. +2022-01-08 14:27:27.194 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()'. +2022-01-08 14:27:27.195 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()'. +2022-01-08 14:27:27.195 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()'. +2022-01-08 14:27:27.196 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()'. +2022-01-08 14:27:27.197 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()'. +2022-01-08 14:27:27.198 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()'. +2022-01-08 14:27:27.254 G Entity Framework Core "5.0.8" initialized '"SettleAccountDbContext"' using provider '"Microsoft.EntityFrameworkCore.SqlServer"' with options: "QuerySplittingBehavior=SplitQuery " +2022-01-08 14:27:27.434 G Executed DbCommand ("4"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;" +2022-01-08 14:27:27.488 G Executed DbCommand ("4"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" +2022-01-08 14:27:30.501 G Executed DbCommand ("4"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]" +2022-01-08 14:27:30.564 G Executed DbCommand ("10"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_TaskJobTemp121048d1] FROM [dbo].[Set_TaskJob] AS T LEFT JOIN [dbo].[Set_TaskJob] AS Source ON 1 = 0;" +2022-01-08 14:27:30.681 G Executed DbCommand ("14"ms) [Parameters=[""], CommandType='Text', CommandTimeout='1800']" +""MERGE [dbo].[Set_TaskJob] WITH (HOLDLOCK) AS T USING (SELECT TOP 1 * FROM [dbo].[Set_TaskJobTemp121048d1] 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];" +2022-01-08 14:27:30.691 G Executed DbCommand ("5"ms) [Parameters=[""], CommandType='Text', CommandTimeout='1800']" +""IF OBJECT_ID ('[dbo].[Set_TaskJobTemp121048d1]', 'U') IS NOT NULL DROP TABLE [dbo].[Set_TaskJobTemp121048d1]" +2022-01-08 14:27:30.705 G Executed DbCommand ("4"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" +2022-01-08 14:27:30.725 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;" +2022-01-08 14:27:30.744 G Executing "ObjectResult", writing value of type '"System.String"'. +2022-01-08 14:27:30.747 G Executed action "Win.Sfs.SettleAccount.Reports.ReportServices.ReportService.HQFSharePartSettledDetailDiffExportServiceMake (SettleAccount.Application)" in 6009.4336ms +2022-01-08 14:27:30.749 G Executed endpoint '"Win.Sfs.SettleAccount.Reports.ReportServices.ReportService.HQFSharePartSettledDetailDiffExportServiceMake (SettleAccount.Application)"' +2022-01-08 14:27:30.785 G Entity Framework Core "5.0.8" initialized '"AbpAuditLoggingDbContext"' using provider '"Microsoft.EntityFrameworkCore.SqlServer"' with options: "QuerySplittingBehavior=SplitQuery " +2022-01-08 14:27:30.865 G Executed DbCommand ("5"ms) [Parameters=["@p0='?' (DbType = Guid), @p1='?' (Size = 96), @p2='?' (Size = 512), @p3='?' (Size = 64), @p4='?' (Size = 64), @p5='?' (Size = 128), @p6='?' (Size = 256), @p7='?' (Size = 40), @p8='?' (Size = 64), @p9='?' (Size = 4000), @p10='?' (DbType = Int32), @p11='?' (DbType = DateTime2), @p12='?' (Size = 4000), @p13='?' (Size = 16), @p14='?' (DbType = Int32), @p15='?' (DbType = Guid), @p16='?' (DbType = Guid), @p17='?' (DbType = Guid), @p18='?' (Size = 4000), @p19='?' (Size = 256), @p20='?' (DbType = Guid), @p21='?' (Size = 256)"], CommandType='Text', CommandTimeout='30']" +""SET NOCOUNT ON; +INSERT INTO [AbpAuditLogs] ([Id], [ApplicationName], [BrowserInfo], [ClientId], [ClientIpAddress], [ClientName], [Comments], [ConcurrencyStamp], [CorrelationId], [Exceptions], [ExecutionDuration], [ExecutionTime], [ExtraProperties], [HttpMethod], [HttpStatusCode], [ImpersonatorTenantId], [ImpersonatorUserId], [TenantId], [TenantName], [Url], [UserId], [UserName]) +VALUES (@p0, @p1, @p2, @p3, @p4, @p5, @p6, @p7, @p8, @p9, @p10, @p11, @p12, @p13, @p14, @p15, @p16, @p17, @p18, @p19, @p20, @p21);" +2022-01-08 14:27:30.872 G Executed DbCommand ("4"ms) [Parameters=["@p22='?' (DbType = Guid), @p23='?' (DbType = Guid), @p24='?' (DbType = Int32), @p25='?' (DbType = DateTime2), @p26='?' (Size = 4000), @p27='?' (Size = 128), @p28='?' (Size = 2000), @p29='?' (Size = 256), @p30='?' (DbType = Guid)"], CommandType='Text', CommandTimeout='30']" +""SET NOCOUNT ON; +INSERT INTO [AbpAuditLogActions] ([Id], [AuditLogId], [ExecutionDuration], [ExecutionTime], [ExtraProperties], [MethodName], [Parameters], [ServiceName], [TenantId]) +VALUES (@p22, @p23, @p24, @p25, @p26, @p27, @p28, @p29, @p30);" +2022-01-08 14:27:30.883 G Request finished HTTP/1.1 POST http://localhost:44378/api/settleaccount/ReportMakeService/HQFSharePartSettledDetailDiffExportService application/json 27 - 200 - text/plain;+charset=utf-8 6211.6055ms +2022-01-08 14:27:37.006 G Entity Framework Core "5.0.8" initialized '"SettleAccountDbContext"' using provider '"Microsoft.EntityFrameworkCore.SqlServer"' with options: "QuerySplittingBehavior=SplitQuery " diff --git a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQFSettledDetailDapperRepository.cs b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQFSettledDetailDapperRepository.cs index 84b248b9..51f4abae 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQFSettledDetailDapperRepository.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQFSettledDetailDapperRepository.cs @@ -245,7 +245,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report List _list = new List(); - string condition = " where 1=1 "; + string condition =string.Empty; From 1cc96cfd5db54820ec33f2884c4c405529f39fad Mon Sep 17 00:00:00 2001 From: 44673626 <44673626@qq.com> Date: Sat, 8 Jan 2022 17:06:22 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E7=BB=93=E7=AE=97=E5=90=8E=E7=AB=AF?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Reports/ReportServices/ReportMakeService.cs | 12 ++++++------ .../Report/HQFSettledDetailDapperRepository.cs | 4 +--- .../Report/HQFShippingDapperRepository.cs | 2 +- .../Report/HQHSettledDetailDapperRepository.cs | 8 ++++---- .../Report/HQMSettledDetailDapperRepository.cs | 4 ++-- .../Report/HQMShippingDapperRepository.cs | 2 +- 6 files changed, 15 insertions(+), 17 deletions(-) diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs index 7c46ed9e..5022909f 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs @@ -617,7 +617,7 @@ namespace Win.Sfs.SettleAccount.Reports.ReportServices /// - /// H平台发运核对输出 + /// H平台未结明细 /// /// /// @@ -632,14 +632,14 @@ namespace Win.Sfs.SettleAccount.Reports.ReportServices customConditionList.Add(new CustomCondition() { Name = "Version", Value = input.Version }); customConditionList.Add(new CustomCondition() { Name = "BeginTime", Value = input.Begin }); customConditionList.Add(new CustomCondition() { Name = "EndTime", Value = input.End }); - var _taskid = await _service.ExportEnqueueAsync("H平台发运核对输出", ExportExtentsion.Excel, input.Version, null, CurrentUser, typeof(HQHShippingExportService), customConditionList, (rs) => + var _taskid = await _service.ExportEnqueueAsync("H平台未结明细", ExportExtentsion.Excel, input.Version, null, CurrentUser, typeof(HQHShippingExportService), customConditionList, (rs) => { }); return _taskid; } /// - /// F平台发运核对输出 + /// F平台未结明细 /// /// /// @@ -654,14 +654,14 @@ namespace Win.Sfs.SettleAccount.Reports.ReportServices customConditionList.Add(new CustomCondition() { Name = "Version", Value = input.Version }); customConditionList.Add(new CustomCondition() { Name = "BeginTime", Value = input.Begin }); customConditionList.Add(new CustomCondition() { Name = "EndTime", Value = input.End }); - var _taskid = await _service.ExportEnqueueAsync("F平台发运核对输出", ExportExtentsion.Excel, input.Version, null, CurrentUser, typeof(HQFShippingExportService), customConditionList, (rs) => + var _taskid = await _service.ExportEnqueueAsync("F平台未结明细", ExportExtentsion.Excel, input.Version, null, CurrentUser, typeof(HQFShippingExportService), customConditionList, (rs) => { }); return _taskid; } /// - /// M平台发运核对输出 + /// M平台未明细 /// /// /// @@ -676,7 +676,7 @@ namespace Win.Sfs.SettleAccount.Reports.ReportServices customConditionList.Add(new CustomCondition() { Name = "Version", Value = input.Version }); customConditionList.Add(new CustomCondition() { Name = "BeginTime", Value = input.Begin }); customConditionList.Add(new CustomCondition() { Name = "EndTime", Value = input.End }); - var _taskid = await _service.ExportEnqueueAsync("M平台发运核对输出", ExportExtentsion.Excel, input.Version, null, CurrentUser, typeof(HQMShippingExportService), customConditionList, (rs) => + var _taskid = await _service.ExportEnqueueAsync("M平台未明细", ExportExtentsion.Excel, input.Version, null, CurrentUser, typeof(HQMShippingExportService), customConditionList, (rs) => { }); return _taskid; diff --git a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQFSettledDetailDapperRepository.cs b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQFSettledDetailDapperRepository.cs index 84b248b9..6f732ccf 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQFSettledDetailDapperRepository.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQFSettledDetailDapperRepository.cs @@ -245,9 +245,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report List _list = new List(); - string condition = " where 1=1 "; - - + string condition = " "; if (!string.IsNullOrEmpty(begin)) { diff --git a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQFShippingDapperRepository.cs b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQFShippingDapperRepository.cs index cc8cd239..0629b26e 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQFShippingDapperRepository.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQFShippingDapperRepository.cs @@ -22,7 +22,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report List _list = new List(); - string condition = " where 1=1 "; + string condition = " "; if (!string.IsNullOrEmpty(begin)) { condition += string.Format(" and b.LastModificationTime>='{0}' ", begin); diff --git a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQHSettledDetailDapperRepository.cs b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQHSettledDetailDapperRepository.cs index 59405dce..48eca5bc 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQHSettledDetailDapperRepository.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQHSettledDetailDapperRepository.cs @@ -25,9 +25,9 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report List _list = new List(); - string condition = " where 1=1 "; - + //string condition = " where 1=1 "; + string condition = " "; ////if (!string.IsNullOrEmpty(materialCode)) ////{ @@ -174,9 +174,9 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report List _list = new List(); - string condition = " where 1=1 "; - + //string condition = " where 1=1 "; + string condition = " "; if (!string.IsNullOrEmpty(begin)) { diff --git a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQMSettledDetailDapperRepository.cs b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQMSettledDetailDapperRepository.cs index 1026ea7c..ac559d34 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQMSettledDetailDapperRepository.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQMSettledDetailDapperRepository.cs @@ -25,7 +25,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report List _list = new List(); - string condition = " where 1=1 "; + string condition = " "; ////if (!string.IsNullOrEmpty(materialCode)) @@ -155,7 +155,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report List _list = new List(); - string condition = " where 1=1 "; + string condition = " "; diff --git a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQMShippingDapperRepository.cs b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQMShippingDapperRepository.cs index 6a4ee5b7..191e9c81 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQMShippingDapperRepository.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQMShippingDapperRepository.cs @@ -22,7 +22,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report List _list = new List(); - string condition = " where 1=1 "; + string condition = " "; if (!string.IsNullOrEmpty(begin)) { condition += string.Format(" and b.LastModificationTime>='{0}' ", begin); From e06b482a7d4da039a440da0c94f547a9dba0971f Mon Sep 17 00:00:00 2001 From: Administrator Date: Sat, 8 Jan 2022 17:07:40 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ReportServices/ReportMakeService.cs | 2 +- .../Entities/WMS/TaskList.cs | 132 +++++++++++++----- .../HQFSettledDetailDapperRepository.cs | 2 - .../HQHSettledDetailDapperRepository.cs | 73 +++------- .../HQHSettledDetailDiffExportService.cs | 5 +- .../InvoiceSettledDetailDiffExportService.cs | 7 - 6 files changed, 116 insertions(+), 105 deletions(-) diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs index 7c46ed9e..b3610de3 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs @@ -551,7 +551,7 @@ namespace Win.Sfs.SettleAccount.Reports.ReportServices customConditionList.Add(new CustomCondition() { Name = "Kanban", Value = input.Kanban }); customConditionList.Add(new CustomCondition() { Name = "MaterialGroup", Value = string.IsNullOrEmpty(input.MaterialGroup) ? string.Empty : input.MaterialGroup }); customConditionList.Add(new CustomCondition() { Name = "SapCode", Value = string.IsNullOrEmpty(input.SapCode) ? string.Empty : input.SapCode }); - var _taskid = await _service.ExportEnqueueAsync("H平台核对明细", ExportExtentsion.Excel, input.Version, string.IsNullOrEmpty(input.MaterialGroup) ? string.Empty : input.MaterialGroup, CurrentUser, typeof(HQFSettledDetailDiffExportService), customConditionList, (rs) => + var _taskid = await _service.ExportEnqueueAsync("H平台核对明细", ExportExtentsion.Excel, input.Version, string.IsNullOrEmpty(input.MaterialGroup) ? string.Empty : input.MaterialGroup, CurrentUser, typeof(HQHSettledDetailDiffExportService), customConditionList, (rs) => { }); return _taskid; diff --git a/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TaskList.cs b/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TaskList.cs index 53f61f23..13bccfe4 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TaskList.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TaskList.cs @@ -384,23 +384,25 @@ namespace Win.Sfs.SettleAccount.Entities.WMS Version = version; TaskId = taskId; } - - // 交货单号 实际发货日期 KENN号 底盘号 物料号 物料描述 客户物料 组件组物料 组件组物料描述 物料组(车型) 定价 金额 结算平台未结数量 大众R3未结数量 差异金额 差异数量 漏结标识 漏结期间 说明 [ImporterHeader(Name = "行号")] public string PoLine { set; get; } + + [ImporterHeader(Name = "订货看板编号")] + //KENN号 + public string Kanban { set; get; } + [ImporterHeader(Name = "组件组物料", IsIgnore = true)] public string ParentMaterialCode { set; get; } [ImporterHeader(Name = "交货单号")] public string WmsBillNum { set; get; } - [ImporterHeader(Name = "条码号")] - //KENN号 - public string Kanban { set; get; } - - [ImporterHeader(Name = "物料号")] + //[ImporterHeader(Name = "订货看板编号")] + ////KENN号 + //public string OrderBillNum { set; get; } + [ImporterHeader(Name = "Sap编码")] //物料号 public string MaterialCode { set; get; } - [ImporterHeader(Name = "物料描述")] + [ImporterHeader(Name = "零件中文名称")] //物料描述 public string MaterialDesc { set; get; } [ImporterHeader(Name = "物料组(车型)")] @@ -414,7 +416,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS public string InPut { set; get; } [ImporterHeader(Name = "状态", IsIgnore = true)] public int State { get; set; } - [ImporterHeader(Name = "客户物料")] + [ImporterHeader(Name = "发货零件号")] /// /// 扩展字段1 /// @@ -422,7 +424,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS /// /// 扩展字段2 /// - [ImporterHeader(Name = "订单日期")] + [ImporterHeader(Name = "收货仓库")] public string Extend2 { set; get; } /// /// 扩展字段3 @@ -431,14 +433,26 @@ namespace Win.Sfs.SettleAccount.Entities.WMS public string Version { set; get; } [ImporterHeader(Name = "结算数量")] public decimal Qty { set; get; } - - [ImporterHeader(Name = "单据", IsIgnore = true)] + [ImporterHeader(Name = "数量", IsIgnore = true)] public string BillNum { set; get; } - - [ImporterHeader(Name = "任务", IsIgnore = true)] + [ImporterHeader(Name = "任务描述", IsIgnore = true)] public Guid TaskId { set; get; } + + + + + + + + + + + + + + } /// @@ -605,21 +619,24 @@ namespace Win.Sfs.SettleAccount.Entities.WMS } - // 交货单号 实际发货日期 KENN号 底盘号 物料号 物料描述 客户物料 组件组物料 组件组物料描述 物料组(车型) 定价 金额 结算平台未结数量 大众R3未结数量 差异金额 差异数量 漏结标识 漏结期间 说明 [ImporterHeader(Name = "行号")] public string PoLine { set; get; } + + [ImporterHeader(Name = "订货看板编号")] + //KENN号 + public string Kanban { set; get; } + [ImporterHeader(Name = "组件组物料", IsIgnore = true)] public string ParentMaterialCode { set; get; } [ImporterHeader(Name = "交货单号")] public string WmsBillNum { set; get; } - [ImporterHeader(Name = "条码号")] - //KENN号 - public string Kanban { set; get; } - - [ImporterHeader(Name = "物料号")] + //[ImporterHeader(Name = "订货看板编号")] + ////KENN号 + //public string OrderBillNum { set; get; } + [ImporterHeader(Name = "Sap编码")] //物料号 public string MaterialCode { set; get; } - [ImporterHeader(Name = "物料描述")] + [ImporterHeader(Name = "零件中文名称")] //物料描述 public string MaterialDesc { set; get; } [ImporterHeader(Name = "物料组(车型)")] @@ -633,7 +650,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS public string InPut { set; get; } [ImporterHeader(Name = "状态", IsIgnore = true)] public int State { get; set; } - [ImporterHeader(Name = "客户物料")] + [ImporterHeader(Name = "发货零件号")] /// /// 扩展字段1 /// @@ -641,7 +658,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS /// /// 扩展字段2 /// - [ImporterHeader(Name = "订单日期")] + [ImporterHeader(Name = "收货仓库")] public string Extend2 { set; get; } /// /// 扩展字段3 @@ -650,14 +667,13 @@ namespace Win.Sfs.SettleAccount.Entities.WMS public string Version { set; get; } [ImporterHeader(Name = "结算数量")] public decimal Qty { set; get; } - - [ImporterHeader(Name = "单据", IsIgnore = true)] + [ImporterHeader(Name = "数量", IsIgnore = true)] public string BillNum { set; get; } - - [ImporterHeader(Name = "任务", IsIgnore = true)] + [ImporterHeader(Name = "任务描述", IsIgnore = true)] public Guid TaskId { set; get; } + } /// @@ -687,6 +703,53 @@ namespace Win.Sfs.SettleAccount.Entities.WMS /// public class WmsHQHSharePartOutPutDetial : FullAuditedAggregateRootBase { + + //[ExporterHeader(DisplayName = "交货单号")] + //public string 交货单号 { set; get; } + //[ExporterHeader(DisplayName = "交货时间")] + //public string 交货时间 { set; get; } + //[ExporterHeader(DisplayName = "手工或自动")] + //public string 手工或自动 { set; get; } + //[ExporterHeader(DisplayName = "收货仓库")] + //public string 收货仓库 { set; get; } + //[ExporterHeader(DisplayName = "收货仓库描述")] + //public string 收货仓库描述 { set; get; } + //[ExporterHeader(DisplayName = "订货看板编号")] + //public string 订货看板编号 { set; get; } + //[ExporterHeader(DisplayName = "订货零件号")] + //public string 订货零件号 { set; get; } + //[ExporterHeader(DisplayName = "发货零件号")] + //public string 发货零件号 { set; get; } + //[ExporterHeader(DisplayName = "零件中文名称")] + //public string 零件中文名称 { set; get; } + //[ExporterHeader(DisplayName = "Sap编码")] + //public string Sap编码 { set; get; } + //[ExporterHeader(DisplayName = "物料组(车型)")] + //public string 物料组 { set; get; } + //[ExporterHeader(DisplayName = "发货数量")] + //public decimal 发货数量 { set; get; } + //[ExporterHeader(DisplayName = "发货状态")] + //public string 发货状态 { set; get; } + //[ExporterHeader(DisplayName = "结算验收单号")] + //public string 结算验收单号 { set; get; } + //[ExporterHeader(DisplayName = "结算数量")] + //public decimal 结算数量 { set; get; } + //[ExporterHeader(DisplayName = "结算单价")] + //public decimal 结算单价 { set; get; } + //[ExporterHeader(DisplayName = "结算金额")] + //public decimal 结算金额 { set; get; } + //[ExporterHeader(DisplayName = "发货定价")] + //public decimal 发货定价 { set; get; } + //[ExporterHeader(DisplayName = "发货总金额")] + //public decimal 发货总金额 { set; get; } + //[ExporterHeader(DisplayName = "数量差异")] + //public decimal 数量差异 { set; get; } + //[ExporterHeader(DisplayName = "单价差异")] + //public decimal 单价差异 { set; get; } + //[ExporterHeader(DisplayName = "差异总金额")] + //public decimal 差异总金额 { set; get; } + + public WmsHQHSharePartOutPutDetial() { } @@ -716,17 +779,17 @@ namespace Win.Sfs.SettleAccount.Entities.WMS } //交货单号 - [ImporterHeader(Name = "组件组物料")] + [ImporterHeader(Name = "组件组物料",IsIgnore =true)] public string ParentMaterialCode { set; get; } [ImporterHeader(Name = "交货单号")] public string WmsBillNum { set; get; } - [ImporterHeader(Name = "看板号")] + [ImporterHeader(Name = "订货看板编号")] //KENN号 public string OrderBillNum { set; get; } - [ImporterHeader(Name = "SAP编码")] + [ImporterHeader(Name = "Sap编码")] //物料号 public string MaterialCode { set; get; } - [ImporterHeader(Name = "物料描述")] + [ImporterHeader(Name = "零件中文名称")] //物料描述 public string MaterialDesc { set; get; } [ImporterHeader(Name = "物料组(车型)")] @@ -740,7 +803,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS public string InPut { set; get; } [ImporterHeader(Name = "状态", IsIgnore = true)] public int State { get; set; } - [ImporterHeader(Name = "物料代码")] + [ImporterHeader(Name = "发货零件号")] /// /// 扩展字段1 /// @@ -748,17 +811,18 @@ namespace Win.Sfs.SettleAccount.Entities.WMS /// /// 扩展字段2 /// - [ImporterHeader(Name = "扩展字段2", IsIgnore = true)] + [ImporterHeader(Name = "收货仓库")] public string Extend2 { set; get; } /// /// 扩展字段3 /// [ImporterHeader(Name = "版本号", IsIgnore = true)] public string Version { set; get; } - [ImporterHeader(Name = "开票数量")] + [ImporterHeader(Name = "结算数量")] public decimal Qty { set; get; } [ImporterHeader(Name = "数量", IsIgnore = true)] public string BillNum { set; get; } + [ImporterHeader(Name = "任务描述", IsIgnore = true)] public Guid TaskId { set; get; } } diff --git a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQFSettledDetailDapperRepository.cs b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQFSettledDetailDapperRepository.cs index 51f4abae..b4ae1f7d 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQFSettledDetailDapperRepository.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQFSettledDetailDapperRepository.cs @@ -213,8 +213,6 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report } - - public virtual List GetDiffQtyList(string version) { List _list = new List(); diff --git a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQHSettledDetailDapperRepository.cs b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQHSettledDetailDapperRepository.cs index 59405dce..dcd4643f 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQHSettledDetailDapperRepository.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQHSettledDetailDapperRepository.cs @@ -25,14 +25,8 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report List _list = new List(); - string condition = " where 1=1 "; + string condition = " "; - - ////if (!string.IsNullOrEmpty(materialCode)) - ////{ - - //// condition += string.Format(" and d.MaterialCode in ({0}) ", materialCode); - ////} if (!string.IsNullOrEmpty(begin)) { condition += string.Format(" and b.LastModificationTime>='{0}' ", begin); @@ -41,28 +35,9 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report { condition += string.Format(" and b.LastModificationTime<='{0}' ", end); } - //if (!string.IsNullOrEmpty(cp7begin)) - //{ - // condition += string.Format(" and B.cp7>='{0}' ", cp7begin); - //} - //if (!string.IsNullOrEmpty(cp7end)) - //{ - // condition += string.Format(" and B.cp7<='{0}' ", cp7end); - //} - ////if (!string.IsNullOrEmpty(kennCode)) - ////{ - //// condition += string.Format(" and B.kenncode='{0}' ", kennCode); - ////} - ////if (!string.IsNullOrEmpty(chassisNumber)) - ////{ - //// condition += string.Format(" and B.chassisNumber='{0}' ", chassisNumber); - ////} - ////if (!string.IsNullOrEmpty(materialGroup)) - ////{ - //// condition += string.Format(" B.chassisNumber='{0}' ", materialGroup); - ////} string str = "SELECT\n" + + " temp1.行号, \n"+ " isnull(temp1.交货单号,'') 交货单号,\n" + " temp1.交货时间,\n" + " isnull(temp1.手工或自动,'') 手工或自动,\n" + @@ -88,6 +63,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report "FROM\n" + " (\n" + " SELECT\n" + + " b.poLine AS 行号,\n" + " b.WmsBillNum AS 交货单号,\n" + " b.LastModificationTime AS 交货时间,\n" + " b.IsAuto AS 手工或自动,\n" + @@ -135,31 +111,18 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report { List _list = new List(); var str = - "SELECT temp1.MaterialCode 客户物料号,temp1.HQHKanBan 看板号 ,temp1.SettleQty 结算数量, temp2.Qty 发货数量,( temp1.SettleQty - temp2.Qty ) 差异数量 \n" + - "FROM\n" + - " (\n" + - " SELECT\n" + - " SUM( Qty ) SettleQty,\n" + - " HQHKanBan,\n" + - " MaterialCode \n" + - " FROM\n" + - " Set_HQ_H_Platform where version='{0}'\n" + - " GROUP BY\n" + - " HQHKanBan,\n" + - " MaterialCode \n" + - " ) temp1\n" + - " LEFT JOIN (\n" + - " SELECT\n" + - " SUM( Qty ) Qty,\n" + - " Kanban,\n" + - " MaterialCode \n" + - " FROM\n" + - " Set_HQ_H_Kanban \n" + - " GROUP BY\n" + - " Kanban,\n" + - " MaterialCode \n" + - " ) temp2 ON temp1.HQHKanBan = temp2.Kanban \n" + - " AND temp1.MaterialCode = temp2.MaterialCode where temp1.SettleQty!=temp2.Qty "; + "SELECT\n" + +" temp1.MaterialCode 客户物料号,\n" + +" temp1.HQHKanBan 看板号,\n" + +" temp1.SettleQty 结算数量,\n" + +" ISNULL( temp2.Qty, 0 ) 发货数量,(\n" + +" temp1.SettleQty - ISNULL( temp2.Qty, 0 )) 差异数量 \n" + +"FROM\n" + +" ( SELECT SUM( Qty ) SettleQty, HQHKanBan, MaterialCode FROM Set_HQ_H_Platform WHERE version = '{0}' GROUP BY HQHKanBan, MaterialCode ) temp1\n" + +" LEFT JOIN ( SELECT SUM( Qty ) Qty, Kanban, MaterialCode FROM Set_HQ_H_Kanban GROUP BY Kanban, MaterialCode ) temp2 ON temp1.HQHKanBan = temp2.Kanban \n" + +" AND temp1.MaterialCode = temp2.MaterialCode \n" + +"WHERE\n" + +" temp1.SettleQty != ISNULL( temp2.Qty, 0 )"; str = string.Format(str, version); var _query = DbConnection.Query(str, null, null, true, 1200, null); @@ -174,7 +137,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report List _list = new List(); - string condition = " where 1=1 "; + string condition = " "; @@ -242,10 +205,6 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report return _list; } - - - - } public class HQHSharePartSettledDetailDiff diff --git a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQHSettledDetailDiffExportService.cs b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQHSettledDetailDiffExportService.cs index 0688ad35..fb67fc45 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQHSettledDetailDiffExportService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQHSettledDetailDiffExportService.cs @@ -51,13 +51,12 @@ namespace SettleAccount.Job.Services.Report var warehouseDesc = p_list.Where(p => p.Name == "WarehouseDesc").FirstOrDefault().Value; var _ls = _dapperRepository.GetInvoiceSettledDetailDiffReportList(version, materialCode, begin, end, materialGroup); var _lst = _dapperRepository.GetDiffQtyList(version); - foreach (var itm in _lst) { var _first = _ls.FirstOrDefault(p => p.订货看板编号 == itm.看板号 && p.订货零件号 == itm.客户物料号); if (_first != null) { - _first.发货数量 = _first.结算数量 + itm.差异数量; + _first.结算数量 = _first.发货数量 + itm.差异数量; _first.数量差异 = itm.差异数量; } } @@ -69,8 +68,6 @@ namespace SettleAccount.Job.Services.Report _ls = _ls.Where(p => _groupList.Contains(p.订货看板编号)).ToList(); } } - - if (!string.IsNullOrEmpty(warehouseDesc)) { var _groupList = warehouseDesc.Split(new char[] { '\n' }).Distinct().ToList(); diff --git a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/InvoiceSettledDetailDiffExportService.cs b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/InvoiceSettledDetailDiffExportService.cs index 3e9dffb6..aa0d7a38 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/InvoiceSettledDetailDiffExportService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/InvoiceSettledDetailDiffExportService.cs @@ -43,11 +43,7 @@ namespace SettleAccount.Job.Services public string ExportFile(Guid id, List exportName, List p_list) { - - var _filename = exportName.FirstOrDefault(); - - var version = p_list.Where(p => p.Name == "Version").FirstOrDefault().Value; var materialCode = p_list.Where(p => p.Name == "MaterialCode").FirstOrDefault().Value; var begin = p_list.Where(p => p.Name == "BeginTime").FirstOrDefault().Value; @@ -129,8 +125,6 @@ namespace SettleAccount.Job.Services _ls = _ls.Where(p => _groupList.Contains(p.MaterialGroup)).ToList(); } } - - if (!string.IsNullOrEmpty(kenncode)) { var _groupList = kenncode.Split("\n").ToList(); @@ -163,7 +157,6 @@ namespace SettleAccount.Job.Services _ls = _ls.Where(p => _groupList.Contains(p.SapMaterialCode)).ToList(); } } - _ls = _ls.OrderBy(p => p.ChassisNumber).ThenBy(p => p.KENNCode).ThenBy(p => p.SapMaterialCode).ToList(); } From 0ff364c731c675a5484ca03fd95d79fb2267f40f Mon Sep 17 00:00:00 2001 From: Administrator Date: Sun, 9 Jan 2022 19:03:31 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/Wms/WmsJitOutPutDetialDto.cs | 3 + .../WMS/WMSHQFSharePartAppService .cs | 61 +++++----- .../Entities/WMS/WMSHQHSharePartAppService.cs | 53 +++++++-- .../ReportServices/ReportMakeService.cs | 3 +- .../Entities/WMS/TaskList.cs | 111 ++++++++---------- .../HQFSettledDetailDiffExportService.cs | 18 ++- .../Report/HQHShippingExportService.cs | 2 +- .../HQMSettledDetailDiffExportService.cs | 2 +- 8 files changed, 142 insertions(+), 111 deletions(-) diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Wms/WmsJitOutPutDetialDto.cs b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Wms/WmsJitOutPutDetialDto.cs index 5cfad751..943a8334 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Wms/WmsJitOutPutDetialDto.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Wms/WmsJitOutPutDetialDto.cs @@ -296,6 +296,9 @@ namespace Win.Sfs.SettleAccount.Entities.Wms [ImporterHeader(Name = "物料组(车型)")] //物料组(车型) public string MaterialGroup { set; get; } + [ImporterHeader(Name = "物料组(车型)")] + //物料组(车型) + public string Version { set; get; } diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFSharePartAppService .cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFSharePartAppService .cs index 23230b09..ddd01beb 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFSharePartAppService .cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFSharePartAppService .cs @@ -63,7 +63,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts private readonly ISettleAccountBranchEfCoreRepository _wmsRepository; private readonly ISettleAccountBranchEfCoreRepository _wmsVersionRepository; private readonly WMSEfCoreRepository _wmsefRespository; - + private readonly WmsDapperRepository _wmsDapper; private readonly WMSEfCoreRepository _wmstbRespository; private readonly ISettleAccountBranchEfCoreRepository _job; private readonly IExcelImportAppService _excelImportService; @@ -78,8 +78,8 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts /// /// public WMSHQFSharePartAppService( - - ISettleAccountBranchEfCoreRepository wmsRepository, + WmsDapperRepository wmsDapper, + ISettleAccountBranchEfCoreRepository wmsRepository, ISettleAccountBranchEfCoreRepository job, ISettleAccountBranchEfCoreRepository wmsVersionRepository, WMSEfCoreRepository wmsefRespository, @@ -96,6 +96,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts _wmsRepository = wmsRepository; _wmsVersionRepository = wmsVersionRepository; _wmsefRespository = wmsefRespository; + _wmsDapper = wmsDapper; } private async Task GetCountAsync(WmsSharePartOutPutDetialRequestDto input) @@ -142,6 +143,31 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts input.SkipCount, true); var totalCount = await GetCountAsync(input); + var stockList = _wmsDapper.GetSalesStock(); + var query = from itm in entities + join itm1 in stockList on itm.MaterialCode equals itm1.SapCode + into temp1 + from tm1 in temp1.DefaultIfEmpty() + select new WmsHQHSharePartOutPutDetial( + itm.Id, + itm.WmsBillNum, + itm.OrderBillNum, + itm.MaterialCode, + itm.MaterialDesc, + itm.MaterialGroup, + itm.OutPut, + itm.InPut, + itm.State, + itm.Extend1, + itm.Extend2, + itm.Version, + itm.ParentMaterialCode, + itm.BillNum, + itm.TaskId, + itm.Remark, + itm.Qty, + tm1.Qty + ); return new PagedResultDto(totalCount, entities); } /// @@ -213,6 +239,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts GuidGenerator.Create(), string.Empty, p.结算数量 + ,0 )); _lst.AddRange(_lsAry.ToArray()); } @@ -237,27 +264,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts await _job.UpdateAsync(job); } } - //return _billNum; - //else - //{ - // StringBuilder _buffer = new StringBuilder(); - // foreach (var itm in errList) - // { - // _buffer.AppendFormat("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number); - // } - // var _errinfo = _buffer.ToString(); - // foreach (var job in _joblist) - // { - // job.FileName = _errinfo; - // await _job.UpdateAsync(job); - // } - - // //} - //} - //else - //{ - // _billNum = string.Empty; - //} + return ApplicationConsts.SuccessStr; } /// @@ -363,7 +370,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts GuidGenerator.Create() , string.Empty , itm.Qty - + ,0 ); _lsCopy.Add(_detail); } @@ -391,9 +398,9 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts } var query = from itm1 in _lst join itm2 in outPutDetail on - new { itm1.MaterialCode, itm1.OrderBillNum } + new { itm1.MaterialCode } equals - new { itm2.MaterialCode, itm2.OrderBillNum } into temp1 + new { itm2.MaterialCode } into temp1 from tm1 in temp1.DefaultIfEmpty() where tm1 == null select itm1; diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHSharePartAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHSharePartAppService.cs index b6cb06fe..897a1708 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHSharePartAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHSharePartAppService.cs @@ -63,7 +63,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts private readonly ISettleAccountBranchEfCoreRepository _wmsRepository; private readonly ISettleAccountBranchEfCoreRepository _wmsVersionRepository; private readonly WMSEfCoreRepository _wmsefRespository; - + private readonly WmsDapperRepository _wmsDapper; private readonly WMSEfCoreRepository _wmstbRespository; private readonly ISettleAccountBranchEfCoreRepository _job; private readonly IExcelImportAppService _excelImportService; @@ -87,7 +87,8 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts IExcelImportAppService excelImportService, IDistributedCache cache, ISnowflakeIdGenerator snowflakeIdGenerator, - ICommonManager commonManager + ICommonManager commonManager, + WmsDapperRepository wmsDapper ) : base(cache, excelImportService, snowflakeIdGenerator, commonManager) { _excelImportService = excelImportService; @@ -96,6 +97,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts _wmsRepository = wmsRepository; _wmsVersionRepository = wmsVersionRepository; _wmsefRespository = wmsefRespository; + _wmsDapper = wmsDapper; } private async Task GetCountAsync(WmsSharePartOutPutDetialRequestDto input) @@ -142,7 +144,39 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts input.SkipCount, true); var totalCount = await GetCountAsync(input); - return new PagedResultDto(totalCount, entities); + var stockList = _wmsDapper.GetSalesStock(); + + + + var query= from itm in entities + join itm1 in stockList on itm.MaterialCode equals itm1.SapCode +into temp1 + from tm1 in temp1.DefaultIfEmpty() + select new WmsHQHSharePartOutPutDetial( + itm.Id, + itm.WmsBillNum, + itm.OrderBillNum, + itm.MaterialCode, + itm.MaterialDesc, + itm.MaterialGroup, + itm.OutPut, + itm.InPut, + itm.State, + itm.Extend1, + itm.Extend2, + itm.Version, + itm.ParentMaterialCode, + itm.BillNum, + itm.TaskId, + itm.Remark, + itm.Qty, + tm1.Qty + ); + + + + + return new PagedResultDto(totalCount, query.ToList()); } /// /// 任务明细标记已确认 @@ -212,7 +246,8 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts _billNum, GuidGenerator.Create(), string.Empty, - p.结算数量 + p.结算数量, + 0 )); _lst.AddRange(_lsAry.ToArray()); } @@ -363,7 +398,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts GuidGenerator.Create() , string.Empty , itm.Qty - + ,0 ); _lsCopy.Add(_detail); } @@ -374,9 +409,9 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts var error = from itm1 in outPutDetail join itm2 in _lst on - new { itm1.MaterialCode, itm1.OrderBillNum } + new { itm1.MaterialCode } equals - new { itm2.MaterialCode, itm2.OrderBillNum } + new { itm2.MaterialCode } select itm1; var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Sum(itm => itm.Qty) }); @@ -391,9 +426,9 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts } var query = from itm1 in _lst join itm2 in outPutDetail on - new { itm1.MaterialCode, itm1.OrderBillNum } + new { itm1.MaterialCode} equals - new { itm2.MaterialCode, itm2.OrderBillNum } into temp1 + new { itm2.MaterialCode} into temp1 from tm1 in temp1.DefaultIfEmpty() where tm1 == null select itm1; diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs index b3610de3..fb1bed12 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs @@ -600,7 +600,7 @@ namespace Win.Sfs.SettleAccount.Reports.ReportServices { List customConditionList = new List(); customConditionList.Add(new CustomCondition() { Name = "Version", Value = input.Version }); - customConditionList.Add(new CustomCondition() { Name = "MaterialCode", Value = input.MaterialCode }); + customConditionList.Add(new CustomCondition() { Name = "BeginTime", Value = input.Begin }); customConditionList.Add(new CustomCondition() { Name = "EndTime", Value = input.End }); customConditionList.Add(new CustomCondition() { Name = "MaterialCode", Value = input.MaterialCode }); @@ -632,6 +632,7 @@ namespace Win.Sfs.SettleAccount.Reports.ReportServices customConditionList.Add(new CustomCondition() { Name = "Version", Value = input.Version }); customConditionList.Add(new CustomCondition() { Name = "BeginTime", Value = input.Begin }); customConditionList.Add(new CustomCondition() { Name = "EndTime", Value = input.End }); + customConditionList.Add(new CustomCondition() { Name = "MaterialCode", Value = input.MaterialCode }); var _taskid = await _service.ExportEnqueueAsync("H平台发运核对输出", ExportExtentsion.Excel, input.Version, null, CurrentUser, typeof(HQHShippingExportService), customConditionList, (rs) => { }); diff --git a/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TaskList.cs b/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TaskList.cs index 13bccfe4..ab738021 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TaskList.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TaskList.cs @@ -485,7 +485,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS public WmsHQFSharePartOutPutDetial() { } - public WmsHQFSharePartOutPutDetial(Guid id, string wmsBillNum, string orderBillNum, string materialCode, string materialDesc, string materialGroup, string outPut, string inPut, int state, string extend1, string extend2, string extend3, string parentMaterialCode, string billNum, Guid taskId,string remark,decimal qty ) + public WmsHQFSharePartOutPutDetial(Guid id, string wmsBillNum, string orderBillNum, string materialCode, string materialDesc, string materialGroup, string outPut, string inPut, int state, string extend1, string extend2, string extend3, string parentMaterialCode, string billNum, Guid taskId,string remark,decimal qty ,decimal stockQty ) { Id = id; WmsBillNum = wmsBillNum; @@ -511,14 +511,42 @@ namespace Win.Sfs.SettleAccount.Entities.WMS } //交货单号 - [ImporterHeader(Name = "组件组物料")] + //[ExporterHeader(DisplayName = "收货仓库")] + //public string 收货仓库 { set; get; } + //[ExporterHeader(DisplayName = "收货仓库描述")] + //public string 收货仓库描述 { set; get; } + //[ExporterHeader(DisplayName = "结算物料号")] + //public string 结算物料号 { set; get; } + //[ExporterHeader(DisplayName = "结算物料描述")] + //public string 物料描述 { set; get; } + //[ExporterHeader(DisplayName = "结算数量")] + //public decimal 结算数量 { set; get; } + //[ExporterHeader(DisplayName = "结算单价")] + //public decimal 结算单价 { set; get; } + //[ExporterHeader(DisplayName = "结算金额")] + //public decimal 结算金额 { set; get; } + //[ExporterHeader(DisplayName = "Sap编码")] + //public string Sap编码 { set; get; } + //[ExporterHeader(DisplayName = "物料组(车型)")] + //public string 物料组 { set; get; } + + //[ExporterHeader(DisplayName = "寄销库数量")] + //public decimal 寄销库数量 { set; get; } + + + + + [ImporterHeader(Name = "寄销库数量",IsIgnore =true)] + public decimal StockQty { set; get; } + + [ImporterHeader(Name = "组件组物料",IsIgnore =true)] public string ParentMaterialCode { set; get; } - [ImporterHeader(Name = "交货单号")] + [ImporterHeader(Name = "交货单号",IsIgnore =true)] public string WmsBillNum { set; get; } - [ImporterHeader(Name = "看板号")] + [ImporterHeader(Name = "看板号",IsIgnore =true)] //KENN号 public string OrderBillNum { set; get; } - [ImporterHeader(Name = "SAP编码")] + [ImporterHeader(Name = "Sap编码")] //物料号 public string MaterialCode { set; get; } [ImporterHeader(Name = "物料描述")] @@ -535,7 +563,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS public string InPut { set; get; } [ImporterHeader(Name = "状态",IsIgnore =true)] public int State { get; set; } - [ImporterHeader(Name = "物料代码")] + [ImporterHeader(Name = "结算物料号")] /// /// 扩展字段1 /// @@ -543,16 +571,16 @@ namespace Win.Sfs.SettleAccount.Entities.WMS /// /// 扩展字段2 /// - [ImporterHeader(Name = "扩展字段2",IsIgnore =true)] + [ImporterHeader(Name = "收货仓库")] public string Extend2 { set; get; } /// /// 扩展字段3 /// [ImporterHeader(Name = "版本号",IsIgnore =true)] public string Version { set; get; } - [ImporterHeader(Name = "开票数量")] + [ImporterHeader(Name = "结算数量")] public decimal Qty { set; get; } - [ImporterHeader(Name = "数量", IsIgnore = true)] + [ImporterHeader(Name = "单据号", IsIgnore = true)] public string BillNum { set; get; } public Guid TaskId { set; get; } } @@ -704,56 +732,13 @@ namespace Win.Sfs.SettleAccount.Entities.WMS public class WmsHQHSharePartOutPutDetial : FullAuditedAggregateRootBase { - //[ExporterHeader(DisplayName = "交货单号")] - //public string 交货单号 { set; get; } - //[ExporterHeader(DisplayName = "交货时间")] - //public string 交货时间 { set; get; } - //[ExporterHeader(DisplayName = "手工或自动")] - //public string 手工或自动 { set; get; } - //[ExporterHeader(DisplayName = "收货仓库")] - //public string 收货仓库 { set; get; } - //[ExporterHeader(DisplayName = "收货仓库描述")] - //public string 收货仓库描述 { set; get; } - //[ExporterHeader(DisplayName = "订货看板编号")] - //public string 订货看板编号 { set; get; } - //[ExporterHeader(DisplayName = "订货零件号")] - //public string 订货零件号 { set; get; } - //[ExporterHeader(DisplayName = "发货零件号")] - //public string 发货零件号 { set; get; } - //[ExporterHeader(DisplayName = "零件中文名称")] - //public string 零件中文名称 { set; get; } - //[ExporterHeader(DisplayName = "Sap编码")] - //public string Sap编码 { set; get; } - //[ExporterHeader(DisplayName = "物料组(车型)")] - //public string 物料组 { set; get; } - //[ExporterHeader(DisplayName = "发货数量")] - //public decimal 发货数量 { set; get; } - //[ExporterHeader(DisplayName = "发货状态")] - //public string 发货状态 { set; get; } - //[ExporterHeader(DisplayName = "结算验收单号")] - //public string 结算验收单号 { set; get; } - //[ExporterHeader(DisplayName = "结算数量")] - //public decimal 结算数量 { set; get; } - //[ExporterHeader(DisplayName = "结算单价")] - //public decimal 结算单价 { set; get; } - //[ExporterHeader(DisplayName = "结算金额")] - //public decimal 结算金额 { set; get; } - //[ExporterHeader(DisplayName = "发货定价")] - //public decimal 发货定价 { set; get; } - //[ExporterHeader(DisplayName = "发货总金额")] - //public decimal 发货总金额 { set; get; } - //[ExporterHeader(DisplayName = "数量差异")] - //public decimal 数量差异 { set; get; } - //[ExporterHeader(DisplayName = "单价差异")] - //public decimal 单价差异 { set; get; } - //[ExporterHeader(DisplayName = "差异总金额")] - //public decimal 差异总金额 { set; get; } + public WmsHQHSharePartOutPutDetial() { } - public WmsHQHSharePartOutPutDetial(Guid id, string wmsBillNum, string orderBillNum, string materialCode, string materialDesc, string materialGroup, string outPut, string inPut, int state, string extend1, string extend2, string extend3, string parentMaterialCode, string billNum, Guid taskId, string remark, decimal qty) + public WmsHQHSharePartOutPutDetial(Guid id, string wmsBillNum, string orderBillNum, string materialCode, string materialDesc, string materialGroup, string outPut, string inPut, int state, string extend1, string extend2, string extend3, string parentMaterialCode, string billNum, Guid taskId, string remark, decimal qty,decimal stockQty) { Id = id; WmsBillNum = wmsBillNum; @@ -772,6 +757,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS TaskId = taskId; Remark = remark; Qty = qty; + StockQty = stockQty; } public void SetId(Guid id) { @@ -779,17 +765,20 @@ namespace Win.Sfs.SettleAccount.Entities.WMS } //交货单号 - [ImporterHeader(Name = "组件组物料",IsIgnore =true)] + [ImporterHeader(Name = "寄销库数量", IsIgnore = true)] + public decimal StockQty { set; get; } + + [ImporterHeader(Name = "组件组物料", IsIgnore = true)] public string ParentMaterialCode { set; get; } - [ImporterHeader(Name = "交货单号")] + [ImporterHeader(Name = "交货单号", IsIgnore = true)] public string WmsBillNum { set; get; } - [ImporterHeader(Name = "订货看板编号")] + [ImporterHeader(Name = "看板号", IsIgnore = true)] //KENN号 public string OrderBillNum { set; get; } [ImporterHeader(Name = "Sap编码")] //物料号 public string MaterialCode { set; get; } - [ImporterHeader(Name = "零件中文名称")] + [ImporterHeader(Name = "物料描述")] //物料描述 public string MaterialDesc { set; get; } [ImporterHeader(Name = "物料组(车型)")] @@ -803,7 +792,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS public string InPut { set; get; } [ImporterHeader(Name = "状态", IsIgnore = true)] public int State { get; set; } - [ImporterHeader(Name = "发货零件号")] + [ImporterHeader(Name = "结算物料号")] /// /// 扩展字段1 /// @@ -820,9 +809,9 @@ namespace Win.Sfs.SettleAccount.Entities.WMS public string Version { set; get; } [ImporterHeader(Name = "结算数量")] public decimal Qty { set; get; } - [ImporterHeader(Name = "数量", IsIgnore = true)] + [ImporterHeader(Name = "单据号", IsIgnore = true)] public string BillNum { set; get; } - [ImporterHeader(Name = "任务描述", IsIgnore = true)] + [ImporterHeader(Name = "任务ID", IsIgnore = true)] public Guid TaskId { set; get; } } diff --git a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQFSettledDetailDiffExportService.cs b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQFSettledDetailDiffExportService.cs index b552e6f8..20b0c33d 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQFSettledDetailDiffExportService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQFSettledDetailDiffExportService.cs @@ -51,17 +51,16 @@ namespace SettleAccount.Job.Services var acceptNo = p_list.Where(p => p.Name == "AcceptNo").FirstOrDefault().Value; var sapCode = p_list.Where(p => p.Name == "SapCode").FirstOrDefault().Value; var warehouseDesc = p_list.Where(p => p.Name == "WarehouseDesc").FirstOrDefault().Value; - var _ls = _dapperRepository.GetInvoiceSettledDetailDiffReportList(version, materialCode, begin, end, materialGroup); - var _lst=_dapperRepository.GetDiffQtyList(version); - + var _ls = _dapperRepository.GetInvoiceSettledDetailDiffReportList(version, materialCode, begin, end, materialGroup); + var _lst = _dapperRepository.GetDiffQtyList(version); foreach (var itm in _lst) { - var _first = _ls.FirstOrDefault(p => p.订货看板编号 == itm.看板号 && p.订货零件号==itm.客户物料号); - if(_first!=null) + var _first = _ls.FirstOrDefault(p => p.订货看板编号 == itm.看板号 && p.订货零件号 == itm.客户物料号); + if (_first != null) { - _first.发货数量 = _first.结算数量+ itm.差异数量; + _first.结算数量 = _first.发货数量 + itm.差异数量; _first.数量差异 = itm.差异数量; - } + } } if (!string.IsNullOrEmpty(kanban)) { @@ -71,9 +70,7 @@ namespace SettleAccount.Job.Services _ls = _ls.Where(p => _groupList.Contains(p.订货看板编号)).ToList(); } } - - - if (!string.IsNullOrEmpty(warehouseDesc)) + if (!string.IsNullOrEmpty(warehouseDesc)) { var _groupList = warehouseDesc.Split(new char[] { '\n' }).Distinct().ToList(); if (_groupList.Count() > 0) @@ -81,7 +78,6 @@ namespace SettleAccount.Job.Services _ls = _ls.Where(p => _groupList.Contains(p.收货仓库描述)).ToList(); } } - if (!string.IsNullOrEmpty(acceptNo)) { var _groupList = acceptNo.Split(new char[] { '\n' }).Distinct().ToList(); diff --git a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQHShippingExportService.cs b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQHShippingExportService.cs index c334bc70..c1247ac2 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQHShippingExportService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQHShippingExportService.cs @@ -43,7 +43,7 @@ namespace SettleAccount.Job.Services.Report var begin = p_list.Where(p => p.Name == "BeginTime").FirstOrDefault().Value; var end = p_list.Where(p => p.Name == "EndTime").FirstOrDefault().Value; var materialGroup = p_list.Where(p => p.Name == "MaterialGroup").FirstOrDefault().Value; - var acceptNo = p_list.Where(p => p.Name == "AcceptNo").FirstOrDefault().Value; + //var acceptNo = p_list.Where(p => p.Name == "AcceptNo").FirstOrDefault().Value; var sapCode = p_list.Where(p => p.Name == "SapCode").FirstOrDefault().Value; var warehouseDesc = p_list.Where(p => p.Name == "WarehouseDesc").FirstOrDefault().Value; var _ls = _dapperRepository.GetHQHShippingReportList(version, materialCode, begin, end, materialGroup); diff --git a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQMSettledDetailDiffExportService.cs b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQMSettledDetailDiffExportService.cs index ba7ccbba..a3f102ca 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQMSettledDetailDiffExportService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQMSettledDetailDiffExportService.cs @@ -57,7 +57,7 @@ namespace SettleAccount.Job.Services.Report var _first = _ls.FirstOrDefault(p => p.订货看板编号 == itm.看板号 && p.订货零件号 == itm.客户物料号); if (_first != null) { - _first.发货数量 = _first.结算数量 + itm.差异数量; + _first.结算数量 = _first.发货数量 + itm.差异数量; _first.数量差异 = itm.差异数量; } } From 06765025f3781568db6865544fe2c516e891016c Mon Sep 17 00:00:00 2001 From: 44673626 <44673626@qq.com> Date: Mon, 10 Jan 2022 16:10:13 +0800 Subject: [PATCH 08/10] =?UTF-8?q?20200110-=E7=BA=A2=E6=97=97M=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0=E5=8F=8A=E4=B8=80=E6=B1=BD=E8=BD=BF=E8=BD=A6=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E8=BE=93=E5=87=BA=E4=BB=A3=E7=A0=81=E7=A0=81=E5=90=8E?= =?UTF-8?q?=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/WMS/WmsHQMKanbanAppService.cs | 387 ++++++++++++++++ .../Entities/WMS/WmsHQMSharePartAppService.cs | 425 ++++++++++++++++++ .../ReportServices/ReportMakeService.cs | 123 ++++- .../SettleAccount.Application.xml | 158 ++++++- .../Entities/WMS/TaskList.cs | 229 ++++++++++ .../HQCarSettledDetailDapperRepository.cs | 155 +++++++ .../HQMSettledDetailDapperRepository.cs | 4 +- .../HQCarSettledDetailDiffExportService.cs | 103 +++++ .../HQMSettledDetailDiffExportService.cs | 2 +- 9 files changed, 1577 insertions(+), 9 deletions(-) create mode 100644 src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMKanbanAppService.cs create mode 100644 src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMSharePartAppService.cs create mode 100644 src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQCarSettledDetailDapperRepository.cs create mode 100644 src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQCarSettledDetailDiffExportService.cs diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMKanbanAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMKanbanAppService.cs new file mode 100644 index 00000000..64b2d4fa --- /dev/null +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMKanbanAppService.cs @@ -0,0 +1,387 @@ +using EFCore.BulkExtensions; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc; +using Microsoft.EntityFrameworkCore; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Volo.Abp.Application.Dtos; +using Volo.Abp.Caching; +using Volo.Abp.Domain.Repositories; +using Volo.Abp.Uow; +using Win.Abp.Snowflakes; +using Win.Sfs.BaseData.ImportExcelCommon; +using Win.Sfs.SettleAccount.CommonManagers; +using Win.Sfs.SettleAccount.Constant; +using Win.Sfs.SettleAccount.Entities.TaskJobs; +using Win.Sfs.SettleAccount.Entities.Wms; +using Win.Sfs.SettleAccount.ExcelImporter; +using Win.Sfs.SettleAccount.ExportReports; +using Win.Sfs.SettleAccount.Repository; +using WY.NewJit.Extends.PaiGe.WMS; + +namespace Win.Sfs.SettleAccount.Entities.WMS +{ + /// + /// wms出库-M平台 + /// + + [AllowAnonymous] + [Route("api/settleaccount/WMSHQMKanbanoutput")] + public class WmsHQMKanbanAppService : + SettleAccountApplicationBase + { + + private readonly ISettleAccountBranchEfCoreRepository _wmsRepository; + private readonly ISettleAccountBranchEfCoreRepository _wmsVersionRepository; + private readonly WMSEfCoreRepository _wmsefRespository; + + private readonly WMSEfCoreRepository _wmstbRespository; + private readonly ISettleAccountBranchEfCoreRepository _job; + private readonly IExcelImportAppService _excelImportService; + + + private readonly TaskJobService _service; + /// + /// + /// + /// + /// + /// + /// + /// + public WmsHQMKanbanAppService( + + + IExcelImportAppService excelImportService, + + ISettleAccountBranchEfCoreRepository wmsRepository, + ISettleAccountBranchEfCoreRepository job, + ISettleAccountBranchEfCoreRepository wmsVersionRepository, + WMSEfCoreRepository wmsefRespository, + WMSEfCoreRepository wmstbRespository, + IDistributedCache cache, + ISnowflakeIdGenerator snowflakeIdGenerator, + ICommonManager commonManager + ) : base(cache, excelImportService, snowflakeIdGenerator, commonManager) + { + _job = job; + _wmstbRespository = wmstbRespository; + _wmsRepository = wmsRepository; + _wmsVersionRepository = wmsVersionRepository; + _wmsefRespository = wmsefRespository; + _excelImportService = excelImportService; + } + + private async Task GetCountAsync(WmsKanbanOutPutDetialRequestDto input) + { + return await _wmsRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters); + } + + private async Task GetCountAsync(WmsKanbanOutPutRequestDto input) + { + return await _wmsVersionRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters); + } + + /// + /// 准时化出库主表 + /// + /// + /// + [HttpPost] + [Route("WmsHQMKanbanList")] + //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] + virtual public async Task> GetListAsync(WmsKanbanOutPutRequestDto input) + { + + var entities = await _wmsVersionRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount, + input.SkipCount, true); + + var totalCount = await GetCountAsync(input); + + + return new PagedResultDto(totalCount, entities); + } + + /// + /// 准时化出库明细 + /// + /// + /// + [HttpPost] + [Route("WmsHQMKanbanDetailList")] + //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] + virtual public async Task> GetListAsync(WmsKanbanOutPutDetialRequestDto input) + { + var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount, + input.SkipCount, true); + + var totalCount = await GetCountAsync(input); + return new PagedResultDto(totalCount, entities); + } + /// + /// 任务明细标记已确认 + /// + /// 上传的文件(前端已经限制只能上传一个附件) + /// + [HttpPost] + [Route("WmsHQMKanbanOutPutAudit")] + [DisableRequestSizeLimit] + + public async Task WmsHQMKanbanAudit(List ids) + { + var _joblist = await _job.Where(p => ids.Contains(p.Id)).ToListAsync(); + foreach (var itm in _joblist) + { + itm.FileName = "已确认"; + await _job.UpdateAsync(itm); + } + + return true; + } + + + /// + /// 选择任务，生成出库单，只包含已确认的单据 + /// + /// + /// + /// + [HttpPost] + [Route("WmsHQMKanbanOutPut")] + public async Task WmsHQMKanbanOutPut(WmsJitRequestDto input) + { + var _billNum = "HQKB" + DateTime.Now.ToString("yyyyMMddhhmmss"); + + var _joblist = _job.Where(p => input.Guids.Contains(p.Id) && p.FileName == "已确认").ToList(); + if (_joblist.Count() > 0) + { + var fileList = _joblist.Select(p => p.RealDownFileName).ToList(); + List _lst = new List(); + foreach (var filename in fileList) + { + string fileSavePath = Environment.CurrentDirectory + @"\wwwroot\files\host\my-file-container\" + filename; + ExcelHelper _excelHelper = new ExcelHelper(fileSavePath); + var _list = _excelHelper.ExcelToList(); + foreach (var itm in _list) + { + itm.SetData(GuidGenerator.Create(), string.Empty, !string.IsNullOrEmpty(itm.WmsBillNum) ? itm.WmsBillNum : string.Empty, input.Version, GuidGenerator.Create()); + } + _lst.AddRange(_list.ToArray()); + } + + var outPutDetail = await _wmsRepository.Where(p => p.Version == input.Version).ToListAsync(); + + var error = from itm1 in outPutDetail + join itm2 in _lst on + new { itm1.MaterialCode, itm1.Kanban, itm1.PoLine } + equals + new { itm2.MaterialCode, itm2.Kanban, itm2.PoLine } + select itm1; + var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Sum(itm => itm.Qty) }); + if (errList.Count() == 0) + { + + var query = from itm1 in _lst + join itm2 in outPutDetail on + new { itm1.MaterialCode, itm1.Kanban } + equals + new { itm2.MaterialCode, itm2.Kanban } into temp1 + from tm1 in temp1.DefaultIfEmpty() + where tm1 == null + select itm1; + var _wmslst = query.ToList(); + foreach (var itm in _wmslst) + { + itm.BillNum = _billNum; + } + await _wmsRepository.GetDbContext().BulkInsertAsync(_wmslst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 }); + int _count = _wmsVersionRepository.Count(p => p.Version == input.Version && p.BillNum == _billNum); + if (_count == 0) + { + var _version = new WmsHQMKanbanOutPut(GuidGenerator.Create(), input.Version, _billNum, CurrentUser.Email); + + await _wmsVersionRepository.InsertAsync(_version, true); + } + + foreach (var job in _joblist) + { + job.FileName = _billNum; + await _job.UpdateAsync(job); + } + } + else + { + StringBuilder _buffer = new StringBuilder(); + foreach (var itm in errList) + { + _buffer.AppendFormat("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number); + } + var _errinfo = _buffer.ToString(); + + foreach (var job in _joblist) + { + job.FileName = _errinfo; + await _job.UpdateAsync(job); + } + } + } + else + { + _billNum = string.Empty; + } + return ApplicationConsts.SuccessStr; ; + } + /// + /// 出库界面功能，核准出库功能 + /// + /// + /// + /// + [HttpPost] + [Route("WmsHQMKanbanOutPut-Pass")] + [UnitOfWork(false)] + public async Task WmsHQMKanbanOutPutPass(WmsJitRequestDto input) + { + var sql = "DECLARE @return_value int\n" + + "EXEC @return_value = [dbo].[p_wms_output]\n" + + " @billnum = N'{0}',\n" + + " @type = 3,\n" + + " @date = N'{1}'\n" + + "SELECT 'Return Value' = @return_value"; + await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( + string.Format(sql, input.BillNum, input.AccountDate) + ); + + + + return true; + + } + /// + ///出库界面功能， 撤销核准出库 + /// + /// + /// + /// + [HttpPost] + [Route("WmsHQMKanbanOutPut-Cancel")] + public async Task WmsHQMKanbanOutPutCancel(WmsJitRequestDto input) + { + if (input.Guids != null && input.Guids.Count() > 0) + { + List _ls = new List(); + foreach (var itm in input.Guids) + { + _ls.Add(string.Format("{0}", itm)); + } + + string str = string.Join(",", _ls.ToArray()); + + var sql = "DECLARE @return_value int\n" + + "EXEC @return_value = [dbo].[p_wms_output_cancel]\n" + + " @Guids ={0}, \n" + + " @billnum = N'{1}',\n" + + " @type = 3,\n" + + " @accountdate = N'{2}'\n" + + "SELECT 'Return Value' = @return_value"; + + sql = string.Format(sql, str, input.BillNum, input.AccountDate); + + await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( + sql + ); + + } + + return true; + } + [HttpPost] + [Route("ExcelImport")] + [DisableRequestSizeLimit] + //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] + public async Task ExcelImport([FromForm] IFormFileCollection files, string version) + { + var _billNum = "HQKB" + DateTime.Now.ToString("yyyyMMddhhmmss"); + ExportImporter _exportImporter = new ExportImporter(); + var result = await _exportImporter.ExtendExcelImport(files, _excelImportService); + List _lst = new List(); + var _lsCopy = new List(); + foreach (var itm in result) + { + WmsHQMKanbanOutPutDetial _detail = new WmsHQMKanbanOutPutDetial( + GuidGenerator.Create(), + itm.WmsBillNum, + itm.Kanban, + itm.MaterialCode, + itm.MaterialDesc, + itm.MaterialGroup, + string.Empty, + string.Empty, + 0, + string.Empty, + string.Empty, + version, + itm.ParentMaterialCode, + itm.BillNum, + GuidGenerator.Create() + , string.Empty + , itm.Qty, + itm.PoLine + ); + _lsCopy.Add(_detail); + } + _lst.AddRange(_lsCopy.ToArray()); + + + var outPutDetail = await _wmsRepository.Where(p => p.Version == version).ToListAsync(); + + + var error = from itm1 in outPutDetail + join itm2 in _lst on + new { itm1.MaterialCode, itm1.Kanban, itm1.PoLine } + equals + new { itm2.MaterialCode, itm2.Kanban, itm2.PoLine } + select itm1; + var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Sum(itm => itm.Qty) }); + + var checkList = new List(); + foreach (var itm in errList) + { + checkList.Add(new ErrorExportDto() { Message = string.Format("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number) }); + } + if (checkList.Count > 0) + { + + return await ExportErrorReportAsync(checkList); + } + + var query = from itm1 in _lst + join itm2 in outPutDetail on + new { itm1.MaterialCode, itm1.Kanban, itm1.PoLine } + equals + new { itm2.MaterialCode, itm2.Kanban, itm2.PoLine } into temp1 + from tm1 in temp1.DefaultIfEmpty() + where tm1 == null + select itm1; + var _wmslst = query.ToList(); + foreach (var itm in _wmslst) + { + itm.BillNum = _billNum; + } + await _wmsRepository.GetDbContext().BulkInsertAsync(_wmslst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 }); + int _count = _wmsVersionRepository.Count(p => p.Version == version && p.BillNum == _billNum); + if (_count == 0) + { + var _version = new WmsHQMKanbanOutPut(GuidGenerator.Create(), version, _billNum, CurrentUser.Email); + await _wmsVersionRepository.InsertAsync(_version, true); + } + return _billNum; + } + + + } +} diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMSharePartAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMSharePartAppService.cs new file mode 100644 index 00000000..94cfd1d7 --- /dev/null +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMSharePartAppService.cs @@ -0,0 +1,425 @@ +using EFCore.BulkExtensions; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc; +using Microsoft.EntityFrameworkCore; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Volo.Abp.Application.Dtos; +using Volo.Abp.Caching; +using Volo.Abp.Domain.Repositories; +using Volo.Abp.Uow; +using Win.Abp.Snowflakes; +using Win.Sfs.BaseData.ImportExcelCommon; +using Win.Sfs.SettleAccount.CommonManagers; +using Win.Sfs.SettleAccount.Constant; +using Win.Sfs.SettleAccount.Entities.TaskJobs; +using Win.Sfs.SettleAccount.Entities.Wms; +using Win.Sfs.SettleAccount.ExcelImporter; +using Win.Sfs.SettleAccount.ExportReports; +using Win.Sfs.SettleAccount.Repository; +using Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report; +using WY.NewJit.Extends.PaiGe.WMS; + +namespace Win.Sfs.SettleAccount.Entities.WMS +{ + /// + /// wms出库 + /// + + [AllowAnonymous] + [Route("api/settleaccount/WmsHQMSharePartoutput")] + public class WmsHQMSharePartAppService : + SettleAccountApplicationBase + { + private readonly ISettleAccountBranchEfCoreRepository _wmsRepository; + private readonly ISettleAccountBranchEfCoreRepository _wmsVersionRepository; + private readonly WMSEfCoreRepository _wmsefRespository; + private readonly WmsDapperRepository _wmsDapper; + private readonly WMSEfCoreRepository _wmstbRespository; + private readonly ISettleAccountBranchEfCoreRepository _job; + private readonly IExcelImportAppService _excelImportService; + + private readonly TaskJobService _service; + /// + /// + /// + /// + /// + /// + /// + /// + public WmsHQMSharePartAppService( + + ISettleAccountBranchEfCoreRepository wmsRepository, + ISettleAccountBranchEfCoreRepository job, + ISettleAccountBranchEfCoreRepository wmsVersionRepository, + WMSEfCoreRepository wmsefRespository, + WMSEfCoreRepository wmstbRespository, + IExcelImportAppService excelImportService, + IDistributedCache cache, + ISnowflakeIdGenerator snowflakeIdGenerator, + ICommonManager commonManager, + WmsDapperRepository wmsDapper + ) : base(cache, excelImportService, snowflakeIdGenerator, commonManager) + { + _excelImportService = excelImportService; + _job = job; + _wmstbRespository = wmstbRespository; + _wmsRepository = wmsRepository; + _wmsVersionRepository = wmsVersionRepository; + _wmsefRespository = wmsefRespository; + _wmsDapper = wmsDapper; + } + + private async Task GetCountAsync(WmsSharePartOutPutDetialRequestDto input) + { + return await _wmsRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters); + } + + private async Task GetCountAsync(WmsSharePartOutPutRequestDto input) + { + return await _wmsVersionRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters); + } + + /// + /// 准时化出库主表 + /// + /// + /// + [HttpPost] + [Route("WmsSharePartList")] + //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] + virtual public async Task> GetListAsync(WmsSharePartOutPutRequestDto input) + { + + var entities = await _wmsVersionRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount, + input.SkipCount, true); + + var totalCount = await GetCountAsync(input); + + + return new PagedResultDto(totalCount, entities); + } + + /// + /// 准时化出库明细 + /// + /// + /// + [HttpPost] + [Route("WmsSharePartDetailList")] + //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] + virtual public async Task> GetListAsync(WmsSharePartOutPutDetialRequestDto input) + { + var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount, + input.SkipCount, true); + + var totalCount = await GetCountAsync(input); + var stockList = _wmsDapper.GetSalesStock(); + + + + var query = from itm in entities + join itm1 in stockList on itm.MaterialCode equals itm1.SapCode + into temp1 + from tm1 in temp1.DefaultIfEmpty() + select new WmsHQMSharePartOutPutDetial( + itm.Id, + itm.WmsBillNum, + itm.OrderBillNum, + itm.MaterialCode, + itm.MaterialDesc, + itm.MaterialGroup, + itm.OutPut, + itm.InPut, + itm.State, + itm.Extend1, + itm.Extend2, + itm.Version, + itm.ParentMaterialCode, + itm.BillNum, + itm.TaskId, + itm.Remark, + itm.Qty, + tm1.Qty + ); + + + + + return new PagedResultDto(totalCount, query.ToList()); + } + /// + /// 任务明细标记已确认 + /// + /// 上传的文件(前端已经限制只能上传一个附件) + /// + [HttpPost] + [Route("WmsSharePartOutPutAudit")] + [DisableRequestSizeLimit] + + public async Task WmsSharePartAudit(List ids) + { + var _joblist = await _job.Where(p => ids.Contains(p.Id)).ToListAsync(); + foreach (var itm in _joblist) + { + itm.FileName = "已确认"; + } + foreach (var itm in _joblist) + { + await _job.UpdateAsync(itm); + } + var _count = await _job.BatchUpdateAsync(_joblist.ToList()); + if (_count > 0) + { + return true; + } + return false; + } + /// + /// 选择任务，生成出库单，只包含已确认的单据 + /// + /// + /// + /// + [HttpPost] + [Route("WmsSharePartOutPut")] + public async Task WmsSharePartOutPut(WmsJitRequestDto input) + { + var _billNum = "BHQ" + DateTime.Now.ToString("yyyyMMddhhmmss"); + var _joblist = _job.Where(p => input.Guids.Contains(p.Id) && p.FileName == "已确认").ToList(); + if (_joblist.Count() > 0) + { + var fileList = _joblist.Select(p => p.RealDownFileName).ToList(); + List _lst = new List(); + foreach (var filename in fileList) + { + string fileSavePath = Environment.CurrentDirectory + @"\wwwroot\files\host\my-file-container\" + filename; + ExcelHelper _excelHelper = new ExcelHelper(fileSavePath); + var _list = _excelHelper.ExcelToList(); + if (_list.Count() > 0) + { + var _lsAry = _list.Select(p => new + WmsHQMSharePartOutPutDetial( + GuidGenerator.Create(), + "", + string.Empty, + p.结算物料号, + p.物料描述, + p.物料组, + string.Empty, + string.Empty, + 0, + string.Empty, + string.Empty, + input.Version, + p.Sap编码, + _billNum, + GuidGenerator.Create(), + string.Empty, + p.结算数量, + 0 + )); + _lst.AddRange(_lsAry.ToArray()); + } + } + foreach (var itm in _lst) + { + itm.BillNum = _billNum; + } + await _wmsRepository.GetDbContext().BulkInsertAsync(_lst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 }); + int _count = _wmsVersionRepository.Count(p => p.Version == input.Version && p.BillNum == _billNum); + if (_count == 0) + { + var _version = new WmsHQMSharePartOutPut(GuidGenerator.Create(), input.Version, _billNum, CurrentUser.Email); + + await _wmsVersionRepository.InsertAsync(_version, true); + + } + + foreach (var job in _joblist) + { + job.FileName = _billNum; + await _job.UpdateAsync(job); + } + } + //return _billNum; + //else + //{ + // StringBuilder _buffer = new StringBuilder(); + // foreach (var itm in errList) + // { + // _buffer.AppendFormat("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number); + // } + // var _errinfo = _buffer.ToString(); + // foreach (var job in _joblist) + // { + // job.FileName = _errinfo; + // await _job.UpdateAsync(job); + // } + + // //} + //} + //else + //{ + // _billNum = string.Empty; + //} + return ApplicationConsts.SuccessStr; + } + /// + /// 出库界面功能，核准出库功能 + /// + /// + /// + /// + [HttpPost] + [Route("WmsSharePartOutPut-Pass")] + [UnitOfWork(false)] + public async Task WmsSharePartOutPutPass(WmsJitRequestDto input) + { + if (input.Guids != null) + { + List _ls = new List(); + if (input.Guids.Count() > 0) + { + _ls = await _wmsRepository.Where(p => input.Guids.Contains(p.Id) && p.Version == input.Version && p.BillNum == input.BillNum && p.State != 2).ToListAsync(); + } + else + { + _ls = await _wmsRepository.Where(p => p.Version == input.Version && p.BillNum == input.BillNum && p.State != 2).ToListAsync(); + } + if (_ls.Count() > 0) + { + var sql = "DECLARE @return_value int\n" + + "EXEC @return_value = [dbo].[p_wms_output]\n" + + " @billnum = N'{0}',\n" + + " @type = 4\n" + + "SELECT 'Return Value' = @return_value"; + await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( + string.Format(sql, input.BillNum)); + + } + } + return true; + } + /// + ///出库界面功能， 撤销核准出库 + /// + /// + /// + /// + [HttpPost] + [Route("WmsSharePartOutPut-Cancel")] + public async Task WmsSharePartOutPutCancel(WmsJitRequestDto input) + { + if (input.Guids != null && input.Guids.Count() > 0) + { + List _ls = new List(); + foreach (var itm in input.Guids) + { + _ls.Add(string.Format("{0}", itm)); + } + string str = string.Join(",", _ls.ToArray()); + + var sql = "DECLARE @return_value int\n" + + "EXEC @return_value = [dbo].[p_wms_output_cancel]\n" + + " @Guids ={0}, \n" + + " @billnum = N'{1}',\n" + + " @type = 4,\n" + + " @accountdate = N'{2}'\n" + + "SELECT 'Return Value' = @return_value"; + + sql = string.Format(sql, str, input.BillNum, input.AccountDate); + + await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( + sql + ); + } + return true; + } + [HttpPost] + [Route("ExcelImport")] + [DisableRequestSizeLimit] + //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] + public async Task ExcelImport([FromForm] IFormFileCollection files, string version) + { + var _billNum = "BHQ" + DateTime.Now.ToString("yyyyMMddhhmmss"); + ExportImporter _exportImporter = new ExportImporter(); + var result = await _exportImporter.ExtendExcelImport(files, _excelImportService); + List _lst = new List(); + + var _lsCopy = new List(); + foreach (var itm in result) + { + WmsHQMSharePartOutPutDetial _detail = new WmsHQMSharePartOutPutDetial( + GuidGenerator.Create(), + itm.WmsBillNum, + itm.OrderBillNum, + itm.MaterialCode, + itm.MaterialDesc, + itm.MaterialGroup, + string.Empty, + string.Empty, + 0, + string.Empty, + string.Empty, + version, + itm.ParentMaterialCode, + itm.BillNum, + GuidGenerator.Create() + , string.Empty + , itm.Qty + , 0 + ); + _lsCopy.Add(_detail); + } + _lst.AddRange(_lsCopy.ToArray()); + + + var outPutDetail = await _wmsRepository.Where(p => p.Version == version).ToListAsync(); + + var error = from itm1 in outPutDetail + join itm2 in _lst on + new { itm1.MaterialCode } + equals + new { itm2.MaterialCode } + select itm1; + var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Sum(itm => itm.Qty) }); + + var checkList = new List(); + foreach (var itm in errList) + { + checkList.Add(new ErrorExportDto() { Message = string.Format("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number) }); + } + if (checkList.Count > 0) + { + return await ExportErrorReportAsync(checkList); + } + var query = from itm1 in _lst + join itm2 in outPutDetail on + new { itm1.MaterialCode } + equals + new { itm2.MaterialCode } into temp1 + from tm1 in temp1.DefaultIfEmpty() + where tm1 == null + select itm1; + var _wmslst = query.ToList(); + foreach (var itm in _wmslst) + { + itm.BillNum = _billNum; + } + await _wmsRepository.GetDbContext().BulkInsertAsync(_wmslst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 }); + int _count = _wmsVersionRepository.Count(p => p.Version == version && p.BillNum == _billNum); + if (_count == 0) + { + var _version = new WmsHQMSharePartOutPut(GuidGenerator.Create(), version, _billNum, CurrentUser.Email); + await _wmsVersionRepository.InsertAsync(_version, true); + } + return _billNum; + } + } +} diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs index d8692cef..0b631c4a 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs @@ -527,6 +527,35 @@ namespace Win.Sfs.SettleAccount.Reports.ReportServices #region 红旗、一汽轿车的输出报表 + /// + /// 一汽轿车 + /// + /// + /// + [HttpPost] + [Route("HQCarSettledDetailDiffExportService")] + [DisableRequestSizeLimit] + public async Task HQCarSettledDetailDiffExportServiceMake( + HQKanbanRequestDto input + ) + { + List customConditionList = new List(); + customConditionList.Add(new CustomCondition() { Name = "Version", Value = input.Version }); + + customConditionList.Add(new CustomCondition() { Name = "BeginTime", Value = input.Begin }); + customConditionList.Add(new CustomCondition() { Name = "EndTime", Value = input.End }); + customConditionList.Add(new CustomCondition() { Name = "MaterialCode", Value = input.MaterialCode }); + customConditionList.Add(new CustomCondition() { Name = "AcceptNo", Value = input.AcceptNo }); + customConditionList.Add(new CustomCondition() { Name = "WarehouseDesc", Value = input.WarehouseDesc }); + customConditionList.Add(new CustomCondition() { Name = "Kanban", Value = input.Kanban }); + customConditionList.Add(new CustomCondition() { Name = "MaterialGroup", Value = string.IsNullOrEmpty(input.MaterialGroup) ? string.Empty : input.MaterialGroup }); + customConditionList.Add(new CustomCondition() { Name = "SapCode", Value = string.IsNullOrEmpty(input.SapCode) ? string.Empty : input.SapCode }); + var _taskid = await _service.ExportEnqueueAsync("一汽轿车核对明细", ExportExtentsion.Excel, input.Version, string.IsNullOrEmpty(input.MaterialGroup) ? string.Empty : input.MaterialGroup, CurrentUser, typeof(HQCarSettledDetailDiffExportService), customConditionList, (rs) => + { + }); + return _taskid; + } + /// ///红旗H平台核对明细 /// @@ -557,6 +586,35 @@ namespace Win.Sfs.SettleAccount.Reports.ReportServices return _taskid; } + /// + /// 红旗H平台备件结算出库 + /// + /// + /// + [HttpPost] + [Route("HQHSharePartSettledDetailDiffExportService")] + [DisableRequestSizeLimit] + public async Task HQHSharePartSettledDetailDiffExportServiceMake( + HQKanbanRequestDto input + ) + { + List customConditionList = new List(); + customConditionList.Add(new CustomCondition() { Name = "Version", Value = input.Version }); + + customConditionList.Add(new CustomCondition() { Name = "BeginTime", Value = input.Begin }); + customConditionList.Add(new CustomCondition() { Name = "EndTime", Value = input.End }); + customConditionList.Add(new CustomCondition() { Name = "MaterialCode", Value = input.MaterialCode }); + customConditionList.Add(new CustomCondition() { Name = "AcceptNo", Value = input.AcceptNo }); + customConditionList.Add(new CustomCondition() { Name = "WarehouseDesc", Value = input.WarehouseDesc }); + customConditionList.Add(new CustomCondition() { Name = "Kanban", Value = input.Kanban }); + customConditionList.Add(new CustomCondition() { Name = "MaterialGroup", Value = string.IsNullOrEmpty(input.MaterialGroup) ? string.Empty : input.MaterialGroup }); + customConditionList.Add(new CustomCondition() { Name = "SapCode", Value = string.IsNullOrEmpty(input.SapCode) ? string.Empty : input.SapCode }); + var _taskid = await _service.ExportEnqueueAsync("H平台备件核对明细", ExportExtentsion.Excel, input.Version, string.IsNullOrEmpty(input.MaterialGroup) ? string.Empty : input.MaterialGroup, CurrentUser, typeof(HQHSharePartSettledDetailDiffExportService), customConditionList, (rs) => + { + }); + return _taskid; + } + /// ///红旗F平台核对明细 /// @@ -609,12 +667,75 @@ namespace Win.Sfs.SettleAccount.Reports.ReportServices customConditionList.Add(new CustomCondition() { Name = "Kanban", Value = input.Kanban }); customConditionList.Add(new CustomCondition() { Name = "MaterialGroup", Value = string.IsNullOrEmpty(input.MaterialGroup) ? string.Empty : input.MaterialGroup }); customConditionList.Add(new CustomCondition() { Name = "SapCode", Value = string.IsNullOrEmpty(input.SapCode) ? string.Empty : input.SapCode }); - var _taskid = await _service.ExportEnqueueAsync("F平台核备件核对明细", ExportExtentsion.Excel, input.Version, string.IsNullOrEmpty(input.MaterialGroup) ? string.Empty : input.MaterialGroup, CurrentUser, typeof(HQFSharePartSettledDetailDiffExportService), customConditionList, (rs) => + var _taskid = await _service.ExportEnqueueAsync("F平台备件核对明细", ExportExtentsion.Excel, input.Version, string.IsNullOrEmpty(input.MaterialGroup) ? string.Empty : input.MaterialGroup, CurrentUser, typeof(HQFSharePartSettledDetailDiffExportService), customConditionList, (rs) => { }); return _taskid; } + /// + ///红旗M平台核对明细 + /// + /// 上传的文件(前端已经限制只能上传一个附件) + /// + [HttpPost] + [Route("HQMSettledDetailDiffExportService")] + [DisableRequestSizeLimit] + public async Task HQMSettledDetailDiffExportServiceMake( + HQKanbanRequestDto input + ) + { + + List customConditionList = new List(); + customConditionList.Add(new CustomCondition() { Name = "Version", Value = input.Version }); + customConditionList.Add(new CustomCondition() { Name = "MaterialCode", Value = input.MaterialCode }); + customConditionList.Add(new CustomCondition() { Name = "BeginTime", Value = input.Begin }); + customConditionList.Add(new CustomCondition() { Name = "EndTime", Value = input.End }); + customConditionList.Add(new CustomCondition() { Name = "MaterialCode", Value = input.MaterialCode }); + customConditionList.Add(new CustomCondition() { Name = "AcceptNo", Value = input.AcceptNo }); + customConditionList.Add(new CustomCondition() { Name = "WarehouseDesc", Value = input.WarehouseDesc }); + customConditionList.Add(new CustomCondition() { Name = "Kanban", Value = input.Kanban }); + customConditionList.Add(new CustomCondition() { Name = "MaterialGroup", Value = string.IsNullOrEmpty(input.MaterialGroup) ? string.Empty : input.MaterialGroup }); + customConditionList.Add(new CustomCondition() { Name = "SapCode", Value = string.IsNullOrEmpty(input.SapCode) ? string.Empty : input.SapCode }); + var _taskid = await _service.ExportEnqueueAsync("M平台核对明细", ExportExtentsion.Excel, input.Version, string.IsNullOrEmpty(input.MaterialGroup) ? string.Empty : input.MaterialGroup, CurrentUser, typeof(HQMSettledDetailDiffExportService), customConditionList, (rs) => + { + }); + return _taskid; + } + + /// + /// 红旗M平台备件结算出库 + /// + /// + /// + [HttpPost] + [Route("HQMSharePartSettledDetailDiffExportService")] + [DisableRequestSizeLimit] + public async Task HQMSharePartSettledDetailDiffExportServiceMake( + HQKanbanRequestDto input + ) + { + List customConditionList = new List(); + customConditionList.Add(new CustomCondition() { Name = "Version", Value = input.Version }); + + customConditionList.Add(new CustomCondition() { Name = "BeginTime", Value = input.Begin }); + customConditionList.Add(new CustomCondition() { Name = "EndTime", Value = input.End }); + customConditionList.Add(new CustomCondition() { Name = "MaterialCode", Value = input.MaterialCode }); + customConditionList.Add(new CustomCondition() { Name = "AcceptNo", Value = input.AcceptNo }); + customConditionList.Add(new CustomCondition() { Name = "WarehouseDesc", Value = input.WarehouseDesc }); + customConditionList.Add(new CustomCondition() { Name = "Kanban", Value = input.Kanban }); + customConditionList.Add(new CustomCondition() { Name = "MaterialGroup", Value = string.IsNullOrEmpty(input.MaterialGroup) ? string.Empty : input.MaterialGroup }); + customConditionList.Add(new CustomCondition() { Name = "SapCode", Value = string.IsNullOrEmpty(input.SapCode) ? string.Empty : input.SapCode }); + var _taskid = await _service.ExportEnqueueAsync("M平台备件核对明细", ExportExtentsion.Excel, input.Version, string.IsNullOrEmpty(input.MaterialGroup) ? string.Empty : input.MaterialGroup, CurrentUser, typeof(HQMSharePartSettledDetailDiffExportService), customConditionList, (rs) => + { + }); + return _taskid; + } + + + + + /// /// H平台未结明细 diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml b/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml index 4dadc755..a2283ac8 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml @@ -1732,7 +1732,7 @@ wms出库 - + @@ -1852,7 +1852,7 @@ wms出库 - + @@ -2661,6 +2661,126 @@ + + + wms出库-M平台 + + + + + + + + + + + + + + + 准时化出库主表 + + + + + + + 准时化出库明细 + + + + + + + 任务明细标记已确认 + + 上传的文件(前端已经限制只能上传一个附件) + + + + + 选择任务，生成出库单，只包含已确认的单据 + + + + + + + + 出库界面功能，核准出库功能 + + + + + + + + 出库界面功能， 撤销核准出库 + + + + + + + + wms出库 + + + + + + + + + + + + + + + 准时化出库主表 + + + + + + + 准时化出库明细 + + + + + + + 任务明细标记已确认 + + 上传的文件(前端已经限制只能上传一个附件) + + + + + 选择任务，生成出库单，只包含已确认的单据 + + + + + + + + 出库界面功能，核准出库功能 + + + + + + + + 出库界面功能， 撤销核准出库 + + + + + 区域相关应用服务 @@ -3270,6 +3390,13 @@ 上传的文件(前端已经限制只能上传一个附件) + + + 一汽轿车 + + + + 红旗H平台核对明细 @@ -3277,6 +3404,13 @@ 上传的文件(前端已经限制只能上传一个附件) + + + 红旗H平台备件结算出库 + + + + 红旗F平台核对明细 @@ -3291,23 +3425,37 @@ + + + 红旗M平台核对明细 + + 上传的文件(前端已经限制只能上传一个附件) + + + + + 红旗M平台备件结算出库 + + + + - H平台发运核对输出 + H平台未结明细 - F平台发运核对输出 + F平台未结明细 - M平台发运核对输出 + M平台未明细 diff --git a/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TaskList.cs b/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TaskList.cs index ab738021..bb2f1557 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TaskList.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TaskList.cs @@ -324,6 +324,235 @@ namespace Win.Sfs.SettleAccount.Entities.WMS } + #region 红旗M平台出库 + + /// + /// 看板M平台明细 + /// + public class WmsHQMKanbanOutPutDetial : FullAuditedAggregateRootBase + { + public WmsHQMKanbanOutPutDetial() + { + } + + public WmsHQMKanbanOutPutDetial(Guid id, string wmsBillNum, string kanban, string materialCode, string materialDesc, string materialGroup, string outPut, string inPut, int state, string extend1, string extend2, string extend3, string parentMaterialCode, string billNum, Guid taskId, string remark, decimal qty, string poline) + { + Id = id; + WmsBillNum = wmsBillNum; + Kanban = kanban; + MaterialCode = materialCode; + MaterialDesc = materialDesc; + MaterialGroup = materialGroup; + OutPut = outPut; + InPut = inPut; + State = state; + Extend1 = extend1; + Extend2 = extend2; + Version = extend3; + ParentMaterialCode = parentMaterialCode; + BillNum = billNum; + TaskId = taskId; + Remark = remark; + Qty = qty; + PoLine = poline; + } + public void SetData(Guid id, string remark, string wmsbillnum, string version, Guid taskId) + { + Id = id; + Remark = remark; + WmsBillNum = wmsbillnum; + Version = version; + TaskId = taskId; + } + // 交货单号 实际发货日期 KENN号 底盘号 物料号 物料描述 客户物料 组件组物料 组件组物料描述 物料组(车型) 定价 金额 结算平台未结数量 大众R3未结数量 差异金额 差异数量 漏结标识 漏结期间 说明 + [ImporterHeader(Name = "行号")] + public string PoLine { set; get; } + + [ImporterHeader(Name = "订货看板编号")] + //KENN号 + public string Kanban { set; get; } + + [ImporterHeader(Name = "组件组物料", IsIgnore = true)] + public string ParentMaterialCode { set; get; } + [ImporterHeader(Name = "交货单号")] + public string WmsBillNum { set; get; } + //[ImporterHeader(Name = "订货看板编号")] + ////KENN号 + //public string OrderBillNum { set; get; } + [ImporterHeader(Name = "Sap编码")] + //物料号 + public string MaterialCode { set; get; } + [ImporterHeader(Name = "零件中文名称")] + //物料描述 + public string MaterialDesc { set; get; } + [ImporterHeader(Name = "物料组(车型)")] + //物料组(车型) + public string MaterialGroup { set; get; } + [ImporterHeader(Name = "出库库位", IsIgnore = true)] + //出库库位 + public string OutPut { set; get; } + [ImporterHeader(Name = "入库库位", IsIgnore = true)] + //入库库位 + public string InPut { set; get; } + [ImporterHeader(Name = "状态", IsIgnore = true)] + public int State { get; set; } + [ImporterHeader(Name = "发货零件号")] + /// + /// 扩展字段1 + /// + public string Extend1 { set; get; } + /// + /// 扩展字段2 + /// + [ImporterHeader(Name = "收货仓库")] + public string Extend2 { set; get; } + /// + /// 扩展字段3 + /// + [ImporterHeader(Name = "版本号", IsIgnore = true)] + public string Version { set; get; } + [ImporterHeader(Name = "结算数量")] + public decimal Qty { set; get; } + [ImporterHeader(Name = "数量", IsIgnore = true)] + public string BillNum { set; get; } + [ImporterHeader(Name = "任务描述", IsIgnore = true)] + public Guid TaskId { set; get; } + + } + + public class WmsHQMKanbanOutPut : FullAuditedAggregateRootBase + { + public WmsHQMKanbanOutPut() + { + } + + public WmsHQMKanbanOutPut(Guid id, string version, string billNum, string creator) : base(id) + { + Id = id; + Version = version; + BillNum = billNum; + Creator = creator; + } + + public string Version { set; get; } + public string BillNum { set; get; } + public string Creator { set; get; } + } + + /// + /// 备件出库 + /// + public class WmsHQMSharePartOutPut : FullAuditedAggregateRootBase + { + public WmsHQMSharePartOutPut() + { + } + public WmsHQMSharePartOutPut(Guid id, string version, string billNum, string creator) : base(id) + { + Id = id; + Version = version; + BillNum = billNum; + Creator = creator; + } + public string Version { set; get; } + public string BillNum { set; get; } + public string Creator { set; get; } + + } + + + /// + /// 备件出库明细 + /// + public class WmsHQMSharePartOutPutDetial : FullAuditedAggregateRootBase + { + + + + + public WmsHQMSharePartOutPutDetial() + { + } + public WmsHQMSharePartOutPutDetial(Guid id, string wmsBillNum, string orderBillNum, string materialCode, string materialDesc, string materialGroup, string outPut, string inPut, int state, string extend1, string extend2, string extend3, string parentMaterialCode, string billNum, Guid taskId, string remark, decimal qty, decimal stockQty) + { + Id = id; + WmsBillNum = wmsBillNum; + OrderBillNum = orderBillNum; + MaterialCode = materialCode; + MaterialDesc = materialDesc; + MaterialGroup = materialGroup; + OutPut = outPut; + InPut = inPut; + State = state; + Extend1 = extend1; + Extend2 = extend2; + Version = extend3; + ParentMaterialCode = parentMaterialCode; + BillNum = billNum; + TaskId = taskId; + Remark = remark; + Qty = qty; + StockQty = stockQty; + } + public void SetId(Guid id) + { + Id = id; + } + //交货单号 + + [ImporterHeader(Name = "寄销库数量", IsIgnore = true)] + public decimal StockQty { set; get; } + + [ImporterHeader(Name = "组件组物料", IsIgnore = true)] + public string ParentMaterialCode { set; get; } + [ImporterHeader(Name = "交货单号", IsIgnore = true)] + public string WmsBillNum { set; get; } + [ImporterHeader(Name = "看板号", IsIgnore = true)] + //KENN号 + public string OrderBillNum { set; get; } + [ImporterHeader(Name = "Sap编码")] + //物料号 + public string MaterialCode { set; get; } + [ImporterHeader(Name = "物料描述")] + //物料描述 + public string MaterialDesc { set; get; } + [ImporterHeader(Name = "物料组(车型)")] + //物料组(车型) + public string MaterialGroup { set; get; } + [ImporterHeader(Name = "出库库位", IsIgnore = true)] + //出库库位 + public string OutPut { set; get; } + [ImporterHeader(Name = "入库库位", IsIgnore = true)] + //入库库位 + public string InPut { set; get; } + [ImporterHeader(Name = "状态", IsIgnore = true)] + public int State { get; set; } + [ImporterHeader(Name = "结算物料号")] + /// + /// 扩展字段1 + /// + public string Extend1 { set; get; } + /// + /// 扩展字段2 + /// + [ImporterHeader(Name = "收货仓库")] + public string Extend2 { set; get; } + /// + /// 扩展字段3 + /// + [ImporterHeader(Name = "版本号", IsIgnore = true)] + public string Version { set; get; } + [ImporterHeader(Name = "结算数量")] + public decimal Qty { set; get; } + [ImporterHeader(Name = "单据号", IsIgnore = true)] + public string BillNum { set; get; } + [ImporterHeader(Name = "任务ID", IsIgnore = true)] + public Guid TaskId { set; get; } + } + + + #endregion + #region 红旗看板 public class WmsHQFKanbanOutPut : FullAuditedAggregateRootBase diff --git a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQCarSettledDetailDapperRepository.cs b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQCarSettledDetailDapperRepository.cs new file mode 100644 index 00000000..c9256a02 --- /dev/null +++ b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQCarSettledDetailDapperRepository.cs @@ -0,0 +1,155 @@ +using Dapper; +using Magicodes.ExporterAndImporter.Core; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Volo.Abp.DependencyInjection; +using Volo.Abp.Domain.Repositories.Dapper; +using Volo.Abp.EntityFrameworkCore; + +namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report +{ + /// + /// 红旗M平台输出报表 + /// + public class HQCarSettledDetailDapperRepository : DapperRepository, ITransientDependency + { + public HQCarSettledDetailDapperRepository(IDbContextProvider dbContextProvider) + : base(dbContextProvider) + { + } + + public virtual List GetDiffQtyList(string version) + { + List _list = new List(); + var str = + "SELECT\n" + + " temp1.MaterialCode 客户物料号,\n" + + " temp1.HQMKanBan 看板号 ,\n" + + " temp1.SettleQty 结算数量,\n" + + " temp2.Qty 发货数量,\n" + + " ( temp1.SettleQty - temp2.Qty ) 差异数量 \n" + + "FROM\n" + + " ( SELECT SUM ( Qty ) SettleQty, HQMKanBan, MaterialCode FROM Set_HQ_M_Platform WHERE version = '{0}' GROUP BY HQMKanBan, MaterialCode ) temp1\n" + + " LEFT JOIN ( SELECT SUM ( Qty ) Qty, Kanban, MaterialCode FROM Set_HQ_M_Kanban GROUP BY Kanban, MaterialCode ) temp2 ON temp1.HQMKanBan = temp2.Kanban \n" + + " AND temp1.MaterialCode = temp2.MaterialCode \n" + + "WHERE\n" + + " temp1.SettleQty!= temp2.Qty"; + str = string.Format(str, version); + + var _query = DbConnection.Query(str, null, null, true, 1200, null); + _list = _query.ToList(); + + + return _list; + + } + public virtual List GetHQCarSettledDetailDiffReportList(string version, string materialCode, string begin, string end, string materialGroup) + { + + List _list = new List(); + + string condition = " "; + + + + if (!string.IsNullOrEmpty(begin)) + { + condition += string.Format(" and a.LastModificationTime>='{0}' ", begin); + } + if (!string.IsNullOrEmpty(end)) + { + condition += string.Format(" and a.LastModificationTime<='{0}' ", end); + } + + string str = + "SELECT\n" + + " temp1.*,\n" + + " isnull( temp2.Price, 0 ) 销售单价,\n" + + " ( isnull( temp1.结算单价, 0 ) - isnull( temp2.Price, 0 ) ) 价格差异 \n" + + "FROM\n" + + " (\n" + + " SELECT\n" + + " A.Price 结算单价,\n" + + " A.Qty 结算数量,\n" + + " A.MaterialCode 结算物料号,\n" + + " A.StorageLocation 收货仓库,\n" + + " A.StorageLocationDesc 收货仓库描述,\n" + + " C.EstimateTypeDesc 物料组,\n" + + " C.MaterialCode Sap编码,\n" + + " C.MaterialDesc 物料描述,\n" + + " 0 寄销库数量 \n" + + " FROM\n" + + " (\n" + + " SELECT\n" + + " Price,\n" + + " SUM ( Qty ) Qty,\n" + + " MaterialCode,\n" + + " StorageLocation,\n" + + " StorageLocationDesc \n" + + " FROM\n" + + " Set_BT_Car_Platform \n" + + " WHERE\n" + + " version = '{0}' \n" + + " {1} \n" + + " GROUP BY\n" + + " MaterialCode,\n" + + " StorageLocation,\n" + + " StorageLocationDesc,\n" + + " price \n" + + " ) A\n" + + " LEFT JOIN Set_material AS c ON a.MaterialCode = c.CustomerPartCode \n" + + " ) temp1\n" + + " LEFT OUTER JOIN ( SELECT Price, MaterialCode FROM Set_PriceList WHERE ( Version = ( SELECT MAX ( Version ) AS Expr1 FROM Set_PriceList ) ) ) AS temp2 ON temp1.Sap编码 = temp2.MaterialCode"; + var _sql = string.Format(str, version, condition); + + var _query = DbConnection.Query(_sql, null, null, true, 1200, null); + _list = _query.ToList(); + return _list; + + } + + + + + } + + public class HQCarSettledDetailDiff + { + [ExporterHeader(DisplayName = "收货仓库")] + public string 收货仓库 { set; get; } + [ExporterHeader(DisplayName = "收货仓库描述")] + public string 收货仓库描述 { set; get; } + [ExporterHeader(DisplayName = "结算物料号")] + public string 结算物料号 { set; get; } + + [ExporterHeader(DisplayName = "结算物料描述")] + public string 物料描述 { set; get; } + + [ExporterHeader(DisplayName = "结算数量")] + public decimal 结算数量 { set; get; } + [ExporterHeader(DisplayName = "结算单价")] + public decimal 结算单价 { set; get; } + [ExporterHeader(DisplayName = "结算金额")] + public decimal 结算金额 { set; get; } + [ExporterHeader(DisplayName = "Sap编码")] + public string Sap编码 { set; get; } + [ExporterHeader(DisplayName = "物料组(车型)")] + public string 物料组 { set; get; } + + [ExporterHeader(DisplayName = "寄销库数量")] + public decimal 寄销库数量 { set; get; } + + + } + public class HQCarSettleQtyDiff + { + public string 客户物料号 { set; get; } + public decimal 结算数量 { set; get; } + public decimal 发货数量 { set; get; } + public decimal 差异数量 { set; get; } + public string 看板号 { set; get; } + } +} diff --git a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQMSettledDetailDapperRepository.cs b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQMSettledDetailDapperRepository.cs index ac559d34..de5156ca 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQMSettledDetailDapperRepository.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQMSettledDetailDapperRepository.cs @@ -112,7 +112,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report " LEFT OUTER JOIN Set_material AS c ON a.MaterialCode = c.CustomerPartCode \n" + " WHERE\n" + " ( a.HQMKanBan <> 'BJ' ) \n" + - " AND a.Version= '{0}' { 1 } \n" + + " AND a.Version= '{0}' {1} \n" + " ) AS temp1\n" + " LEFT OUTER JOIN ( SELECT Price, MaterialCode FROM Set_PriceList WHERE ( Version = ( SELECT MAX ( Version ) FROM Set_PriceList ) ) ) AS TEMP2 ON temp1.Sap编码 = TEMP2.MaterialCode"; var _sql = string.Format(str, version, condition); @@ -197,7 +197,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report " Set_HQ_M_Platform \n" + " WHERE\n" + " version = '{0}' \n" + - " AND HQHKanBan = 'BJ' { 1 } \n" + + " AND HQHKanBan = 'BJ' {1} \n" + " GROUP BY\n" + " MaterialCode,\n" + " StorageLocation,\n" + diff --git a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQCarSettledDetailDiffExportService.cs b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQCarSettledDetailDiffExportService.cs new file mode 100644 index 00000000..ad48c67d --- /dev/null +++ b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQCarSettledDetailDiffExportService.cs @@ -0,0 +1,103 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using TaskJob.EventArgs; +using TaskJob.Interfaces; +using Volo.Abp.DependencyInjection; +using Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report; + +namespace SettleAccount.Job.Services.Report +{ + /// + /// 一汽轿车核对明细 + /// + public class HQCarSettledDetailDiffExportService : ITransientDependency, IExportJob + { + + private readonly HQCarSettledDetailDapperRepository _dapperRepository; + private readonly ErpPartDapperRepository _erpdapperRepository; + + private readonly OutputService _outputService; + private readonly InputService _inputService; + + public HQCarSettledDetailDiffExportService( + + ErpPartDapperRepository erpdapperRepository, + HQCarSettledDetailDapperRepository dapperRepository, + OutputService outputService, + InputService inputService + ) + { + _inputService = inputService; + _outputService = outputService; + _erpdapperRepository = erpdapperRepository; + + _dapperRepository = dapperRepository; + } + + public string ExportFile(Guid id, List exportName, List p_list) + { + var _filename = exportName.FirstOrDefault(); + var version = p_list.Where(p => p.Name == "Version").FirstOrDefault().Value; + var materialCode = p_list.Where(p => p.Name == "MaterialCode").FirstOrDefault().Value; + var kanban = p_list.Where(p => p.Name == "Kanban").FirstOrDefault().Value; + var begin = p_list.Where(p => p.Name == "BeginTime").FirstOrDefault().Value; + var end = p_list.Where(p => p.Name == "EndTime").FirstOrDefault().Value; + var materialGroup = p_list.Where(p => p.Name == "MaterialGroup").FirstOrDefault().Value; + var acceptNo = p_list.Where(p => p.Name == "AcceptNo").FirstOrDefault().Value; + var sapCode = p_list.Where(p => p.Name == "SapCode").FirstOrDefault().Value; + var warehouseDesc = p_list.Where(p => p.Name == "WarehouseDesc").FirstOrDefault().Value; + var _ls = _dapperRepository.GetHQCarSettledDetailDiffReportList(version, materialCode, begin, end, materialGroup); + + if (!string.IsNullOrEmpty(kanban)) + { + var _groupList = kanban.Split(new char[] { '\n' }).Distinct().ToList(); + if (_groupList.Count() > 0) + { + _ls = _ls.Where(p => _groupList.Contains(p.结算物料号)).ToList(); + } + } + + + if (!string.IsNullOrEmpty(warehouseDesc)) + { + var _groupList = warehouseDesc.Split(new char[] { '\n' }).Distinct().ToList(); + if (_groupList.Count() > 0) + { + _ls = _ls.Where(p => _groupList.Contains(p.收货仓库描述)).ToList(); + } + } + + if (!string.IsNullOrEmpty(materialGroup)) + { + var _groupList = materialGroup.Split(new char[] { ',' }).Distinct().ToList(); + if (_groupList.Count() > 0) + { + _ls = _ls.Where(p => _groupList.Contains(p.物料组)).ToList(); + } + } + if (!string.IsNullOrEmpty(materialCode)) + { + var _groupList = materialCode.Split(new char[] { '\n' }).Distinct().ToList(); + if (_groupList.Count() > 0) + { + _ls = _ls.Where(p => _groupList.Contains(p.结算物料号)).ToList(); + } + } + if (!string.IsNullOrEmpty(sapCode)) + { + var _groupList = sapCode.Split(new char[] { '\n' }).Distinct().ToList(); + if (_groupList.Count() > 0) + { + _ls = _ls.Where(p => _groupList.Contains(p.Sap编码)).ToList(); + } + } + _outputService.Export(id, _filename, _ls); + return id.ToString(); + } + + } +} + diff --git a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQMSettledDetailDiffExportService.cs b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQMSettledDetailDiffExportService.cs index a3f102ca..e2267048 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQMSettledDetailDiffExportService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQMSettledDetailDiffExportService.cs @@ -11,7 +11,7 @@ using Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report; namespace SettleAccount.Job.Services.Report { /// - /// 红旗H平台 + /// 红旗M平台 /// public class HQMSettledDetailDiffExportService : ITransientDependency, IExportJob { From 690f5e8c21a44273d112ec4213715a2892fd529e Mon Sep 17 00:00:00 2001 From: Administrator Date: Mon, 10 Jan 2022 16:11:03 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/WMS/WMSKanbanAppService.cs | 5 - .../Entities/WMS/WMSSharePartAppService.cs | 113 +++----- .../ReportServices/ReportMakeService.cs | 2 +- .../SettleAccount.Application.xml | 10 +- .../Entities/WMS/TaskList.cs | 9 +- .../Report/ErpPartDapperRepository.cs | 4 + .../HQMSettledDetailDapperRepository.cs | 2 +- .../SettleSparePartDapperReportRepository.cs | 253 ++++++++++++------ .../Report/SettleSparePartExportService.cs | 56 +++- 9 files changed, 264 insertions(+), 190 deletions(-) diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanAppService.cs index 961e41ca..816e4aaa 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanAppService.cs @@ -292,11 +292,6 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts var _list = _excelHelper.ExcelToList(); foreach (var itm in _list) { - - - - - itm.SetData(GuidGenerator.Create(),string.Empty,!string.IsNullOrEmpty(itm.WmsBillNum)? itm.WmsBillNum:string.Empty,input.Version,GuidGenerator.Create()); } _lst.AddRange(_list.ToArray()); diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs index 67af3e2a..70b3f887 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs @@ -154,20 +154,12 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts public async Task WmsSharePartAudit(List ids) { - var _joblist =await _job.Where(p => ids.Contains(p.Id)).ToListAsync(); + var _joblist = await _job.Where(p => ids.Contains(p.Id)).ToListAsync(); foreach (var itm in _joblist) { itm.FileName = "已确认"; - } - foreach (var itm in _joblist) - { await _job.UpdateAsync(itm); } - var _count=await _job.BatchUpdateAsync(_joblist.ToList()); - if (_count > 0) - { - return true; - } return false; } /// @@ -193,35 +185,36 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts var _list = _excelHelper.ExcelToList(); if (_list.Count() > 0) { - var _lsAry = _list.GroupBy(p => new - { - p.MaterialCode, - p.MaterialGroup, - p.OrderBillNum, - p.MaterialDesc, - p.Version, - p.WmsBillNum, - }).Select(p => new - WmsSharePartOutPutDetial( - GuidGenerator.Create(), - p.Key.WmsBillNum, - p.Key.OrderBillNum, - p.Key.MaterialCode, - p.Key.MaterialDesc, - p.Key.MaterialGroup, - string.Empty, - string.Empty, - 0, - string.Empty, - string.Empty, - string.Empty, - p.Key.MaterialCode, - _billNum, - GuidGenerator.Create(), - string.Empty, - p.Sum(itm => itm.Qty) - )); - _lst.AddRange(_lsAry.ToArray()); + + //var _lsAry = _list.GroupBy(p => new + //{ + // p.MaterialCode, + // p.MaterialGroup, + // p.OrderBillNum, + // p.MaterialDesc, + // p.Version, + // p.WmsBillNum, + //}).Select(p => new + //WmsSharePartOutPutDetial( + // GuidGenerator.Create(), + // p.Key.WmsBillNum, + // p.Key.OrderBillNum, + // p.Key.MaterialCode, + // p.Key.MaterialDesc, + // p.Key.MaterialGroup, + // string.Empty, + // string.Empty, + // 0, + // string.Empty, + // string.Empty, + // string.Empty, + // p.Key.MaterialCode, + // _billNum, + // GuidGenerator.Create(), + // string.Empty, + // p.Sum(itm => itm.Qty) + //)); + _lst.AddRange(_list.ToArray()); } } @@ -229,67 +222,34 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts var error = from itm1 in outPutDetail join itm2 in _lst on - new { itm1.MaterialCode, itm1.OrderBillNum } + new { itm1.MaterialCode, itm1.OrderBillNum,itm1.WmsBillNum } equals - new { itm2.MaterialCode, itm2.OrderBillNum } + new { itm2.MaterialCode, itm2.OrderBillNum,itm2.WmsBillNum } select itm1; var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Sum(itm => itm.Qty) }); if (errList.Count() == 0) { - var query = from itm1 in _lst join itm2 in outPutDetail on - new { itm1.MaterialCode, itm1.OrderBillNum } + new { itm1.MaterialCode, itm1.OrderBillNum, itm1.WmsBillNum } equals - new { itm2.MaterialCode, itm2.OrderBillNum } into temp1 + new { itm2.MaterialCode, itm2.OrderBillNum, itm2.WmsBillNum } into temp1 from tm1 in temp1.DefaultIfEmpty() where tm1 == null select itm1; var _wmslst = query.ToList(); - _wmslst = _wmslst.GroupBy(p => new - { - p.MaterialCode, - p.MaterialGroup, - p.OrderBillNum, - p.MaterialDesc, - p.Version, - p.WmsBillNum, - }).Select(p => new - WmsSharePartOutPutDetial( - GuidGenerator.Create(), - p.Key.WmsBillNum, - p.Key.OrderBillNum, - p.Key.MaterialCode, - p.Key.MaterialDesc, - p.Key.MaterialGroup, - string.Empty, - string.Empty, - 0, - string.Empty, - string.Empty, - string.Empty, - p.Key.MaterialCode, - _billNum, - GuidGenerator.Create(), - string.Empty, - p.Sum(itm => itm.Qty) - )).ToList(); - foreach (var itm in _wmslst) { itm.BillNum = _billNum; } await _wmsRepository.GetDbContext().BulkInsertAsync(_wmslst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 }); int _count = _wmsVersionRepository.Count(p => p.Version == input.Version && p.BillNum == _billNum); - if (_count == 0) + if (_wmslst.Count()>0 && _count == 0) { var _version = new WmsSharePartOutPut(GuidGenerator.Create(), input.Version, _billNum, CurrentUser.Email); - await _wmsVersionRepository.InsertAsync(_version, true); - } - foreach (var job in _joblist) { job.FileName = _billNum; @@ -310,7 +270,6 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts job.FileName = _errinfo; await _job.UpdateAsync(job); } - } } else diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs index d8692cef..cbfaa5ba 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs @@ -199,7 +199,7 @@ namespace Win.Sfs.SettleAccount.Reports.ReportServices customConditionList.Add(new CustomCondition() { Name = "SAPCode", Value = sapCode ?? string.Empty }); customConditionList.Add(new CustomCondition() { Name = "CustomerCode", Value = customerCode ?? string.Empty }); customConditionList.Add(new CustomCondition() { Name = "State", Value = state ?? "0" }); - customConditionList.Add(new CustomCondition() { Name = "MatialCode", Value = matialCode ?? "0" }); + customConditionList.Add(new CustomCondition() { Name = "MatialCode", Value = matialCode ?? string.Empty }); customConditionList.Add(new CustomCondition() { Name = "ProjectName", Value = "大众备件结算核对" }); customConditionList.Add(new CustomCondition() { Name = "BegingTime", Value = begin.ToString() }); customConditionList.Add(new CustomCondition() { Name = "EndTime", Value = end.ToString() }); diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml b/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml index 4dadc755..f7688851 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml @@ -1732,7 +1732,7 @@ wms出库 - + @@ -1852,7 +1852,7 @@ wms出库 - + @@ -3293,21 +3293,21 @@ - H平台发运核对输出 + H平台未结明细 - F平台发运核对输出 + F平台未结明细 - M平台发运核对输出 + M平台未明细 diff --git a/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TaskList.cs b/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TaskList.cs index ab738021..bef96f9d 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TaskList.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TaskList.cs @@ -982,14 +982,14 @@ namespace Win.Sfs.SettleAccount.Entities.WMS Id = id; } - // 交货单号 实际发货日期 KENN号 底盘号 物料号 物料描述 客户物料 组件组物料 组件组物料描述 物料组(车型) 定价 金额 结算平台未结数量 大众R3未结数量 差异金额 差异数量 漏结标识 漏结期间 说明 - //交货单号 + // 期间 交货单号 发货日期 采购订单号 SAP编码 物料代码 物料描述 物料组 开票单价 数量差异 发货数量 开票数量 定价 单价差异 - [ImporterHeader(Name = "组件组物料")] + + [ImporterHeader(Name = "组件组物料",IsIgnore =true)] public string ParentMaterialCode { set; get; } [ImporterHeader(Name = "交货单号")] public string WmsBillNum { set; get; } - [ImporterHeader(Name = "看板号")] + [ImporterHeader(Name = "采购订单号")] //KENN号 public string OrderBillNum { set; get; } @@ -1032,6 +1032,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS public string BillNum { set; get; } + [ImporterHeader(Name = "任务代码", IsIgnore = true)] public Guid TaskId { set; get; } diff --git a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/ErpPartDapperRepository.cs b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/ErpPartDapperRepository.cs index efb50ad0..10ecbb45 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/ErpPartDapperRepository.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/ErpPartDapperRepository.cs @@ -164,5 +164,9 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report var _list = DbConnection.Query(string.Format(str, version)); return _list.ToList(); } + + + + } } diff --git a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQMSettledDetailDapperRepository.cs b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQMSettledDetailDapperRepository.cs index ac559d34..62b3733b 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQMSettledDetailDapperRepository.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQMSettledDetailDapperRepository.cs @@ -197,7 +197,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report " Set_HQ_M_Platform \n" + " WHERE\n" + " version = '{0}' \n" + - " AND HQHKanBan = 'BJ' { 1 } \n" + + " AND HQHKanBan = 'BJ' {1} \n" + " GROUP BY\n" + " MaterialCode,\n" + " StorageLocation,\n" + diff --git a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/SettleSparePartDapperReportRepository.cs b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/SettleSparePartDapperReportRepository.cs index 7b97f9e7..f3c26d8d 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/SettleSparePartDapperReportRepository.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/SettleSparePartDapperReportRepository.cs @@ -2,6 +2,7 @@ using Magicodes.ExporterAndImporter.Core; using System; using System.Collections.Generic; + using System.Linq; using System.Text; using System.Threading.Tasks; @@ -23,59 +24,53 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report public virtual List GetSettleSparePartReportList(string purchaseOrderNo, string version, string sapCode, string matialCode, string begintime, string endtime) { - string sqlString = "SELECT\n" + - " * ,\n" + - " ( Price - InvoicePrice ) AS InvoiceDiffPrice,--单价差异\n" + - " ISNULL( Price * ReceiptQty - InvoiceMoney, 0 ) AS SumDiffMoney --总金额差异\n" + - " \n" + - "FROM\n" + + string sqlString = + " SELECT\n" + + " temp1.期间,\n" + + " temp1.交货单号,\n" + + " temp1.发货日期,\n" + + " temp1.采购订单号,\n" + + " temp1.SAP编码,\n" + + " temp1.物料代码,\n" + + " temp1.物料描述,\n" + + " temp1.物料组,\n" + + " temp1.开票单价,\n" + + " temp1.数量差异,\n" + + " temp1.发货数量,\n" + + " temp1.开票数量,\n" + + " ISNULL( TEMP2.Price, 0 ) AS 定价,\n" + + " temp1.开票单价 - ISNULL( TEMP2.Price, 0 ) AS 单价差异 \n" + + " FROM\n" + " (\n" + " SELECT\n" + - " c.LineNumber,--行号\n" + - " c.Period AS WMSDeliveryDate,--交货日期\n" + - " c.WMSDeliveryNote,--交货单号\n" + - " c.SpareDate AS OrderDate,--订单日期\n" + - " a.PurchaseOrderNo,--采购订单号\n" + - " b.MaterialCode AS SAPCode,--SAP编码，即厂内物料号\n" + - " a.MaterialCode,--物料代码\n" + - " b.MaterialDesc,--物料描述\n" + - " a.PurchaseOrderNoText,--采购订单文本\n" + - " c.ReceiptQty,-- 发货数量\n" + - " a.InvoicedQty AS InvoicedQty,--开票数量\n" + - " ( c.ReceiptQty- d.Amt ) AS SettleInvoiceDiffQty,--发货与开票差异\n" + - " d.InvoicePrice,--开票单价\n" + - " 0 AS InvoiceMoney --开票金额\n" + - " \n" + + " a.Version AS 期间,\n" + + " b.WMSDeliveryNote AS 交货单号,\n" + + " b.SpareDate AS 发货日期,\n" + + " a.PurchaseOrderNo AS 采购订单号,\n" + + " c.MaterialCode AS SAP编码,\n" + + " a.MaterialCode AS 物料代码,\n" + + " c.MaterialDesc AS 物料描述,\n" + + " c.EstimateTypeDesc AS 物料组,\n" + + " a.PurchasePriceNoTax AS 开票单价,\n" + + " 0 AS 数量差异,\n" + + " ISNULL( b.ReceiptQty, 0 ) AS 发货数量,\n" + + " ISNULL( b.ReceiptQty, 0 ) AS 开票数量 \n" + + " FROM\n" + + " (SELECT SUM( ReceiptQty ) AS ReceiptQty, PurchaseOrderNo, MaterialCode, Version, PurchasePriceNoTax FROM Set_SparePart GROUP BY PurchaseOrderNo, MaterialCode, Version, PurchasePriceNoTax ) AS a\n" + + " LEFT OUTER JOIN Set_WMSSparePart AS b ON a.PurchaseOrderNo = b.PurchaseOrderNo \n" + + " AND a.MaterialCode = b.MaterialCode\n" + + " LEFT OUTER JOIN Set_material AS c ON a.MaterialCode = c.CustomerPartCode \n" + + " WHERE\n" + + " ( a.Version = '{0}' )) AS temp1\n" + + " LEFT OUTER JOIN (\n" + + " SELECT\n" + + " Price,\n" + + " MaterialCode \n" + " FROM\n" + - " (\n" + - " SELECT\n" + - " t.PurchaseOrderNoText,\n" + - " t.LineNumber,\n" + - " t.PurchaseOrderNo,\n" + - " t.MaterialCode,\n" + - " MAX ( t.SpareDate ) SpareDate,\n" + - " t.DeliveryOrderNo,\n" + - " SUM ( t.InvoicedQty ) AS InvoicedQty \n" + - " FROM\n" + - " Set_SparePart t \n" + - " WHERE\n" + - " t.Version= '{0}' \n" + - " GROUP BY\n" + - " t.PurchaseOrderNo,\n" + - " t.MaterialCode,\n" + - " t.SpareDate,\n" + - " t.DeliveryOrderNo,\n" + - " t.LineNumber,\n" + - " t.PurchaseOrderNoText \n" + - " ) AS a\n" + - " LEFT JOIN Set_material AS b ON a.MaterialCode= b.CustomerPartCode\n" + - " LEFT JOIN Set_WMSSparePart c ON a.PurchaseOrderNo= c.WMSDeliveryNote \n" + - " AND a.MaterialCode= c.MaterialCode\n" + - " LEFT JOIN ( SELECT SUM ( amt ) / SUM ( Qty ) InvoicePrice, MaterialCode, Amt FROM set_invoice WHERE version = '{0}' GROUP BY materialcode, Amt ) d ON a.MaterialCode= d.MaterialCode \n" + - " ) TEMP1\n" + - " LEFT JOIN ( SELECT Price, --定价\n" + - " MaterialCode --厂内物料号\n" + - " FROM Set_PriceList WHERE version = ( SELECT MAX ( Version ) FROM Set_PriceList ) ) TEMP2 ON TEMP1.SAPCode= TEMP2.MaterialCode"; + " Set_PriceList \n" + + " WHERE\n" + + " (\n" + + " Version = ( SELECT MAX(Version) AS Expr1 FROM Set_PriceList ))) AS TEMP2 ON temp1.SAP编码 = TEMP2.MaterialCode"; string addwhere = string.Empty; string addSqlStr = string.Format(sqlString, version); //if (!string.IsNullOrEmpty(purchaseOrderNo)) @@ -135,7 +130,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report " ) TEMP1 \n" + " LEFT JOIN ( SELECT Price, --定价 \n" + " MaterialCode --厂内物料号 \n" + - " FROM Set_PriceList WHERE version = ( SELECT MAX ( Version ) FROM Set_PriceList ) ) TEMP2 ON TEMP1.SAPCode= TEMP2.MaterialCode "; + " FROM Set_PriceList WHERE version = ( SELECT MAX ( Version ) FROM Set_PriceList_20 ) ) TEMP2 ON TEMP1.SAPCode= TEMP2.MaterialCode "; string addwhere = string.Empty; string addSqlStr = string.Format(sqlString, version); //if (!string.IsNullOrEmpty(purchaseOrderNo)) @@ -162,66 +157,146 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report } + public virtual List GetSettleSparePartSumQtyDiff(string version) + { + string sqlString = "SELECT\n" + + " ISNULL( A.ReceiptQty - ISNULL( B.ReceiptQty, 0 ), 0 ) 数量差异,\n" + + " a.PurchaseOrderNo 订单号,\n" + + " a.MaterialCode 物料号 \n" + + " FROM\n" + + " ( SELECT sum( ReceiptQty ) ReceiptQty, PurchaseOrderNo, MaterialCode FROM Set_SparePart where Version='{0}' GROUP BY PurchaseOrderNo, MaterialCode ) A\n" + + " LEFT JOIN ( SELECT sum( ReceiptQty ) ReceiptQty, PurchaseOrderNo, MaterialCode FROM Set_WMSSparePart GROUP BY PurchaseOrderNo, MaterialCode ) B ON A.MaterialCode = B.MaterialCode \n" + + " AND A.PurchaseOrderNo = B.PurchaseOrderNo"; + string addwhere = string.Empty; + string addSqlStr = string.Format(sqlString, version); + + + string _sql = string.Format(addSqlStr, addwhere); + + var _query = DbConnection.Query(_sql, null, null, true, 1200, null); + return _query.ToList(); + + } + } - /// - /// 大众看板有条码报表 - /// - //[ExcelExporter(Name = "未结明细", AutoFitAllColumn = true, MaxRowNumberOnASheet = 500000)] + + + + + + + + + + +public class SparePartSumQtyDiff +{ + public decimal 数量差异 { set; get; } + public string 订单号 { set; get; } + public string 物料号 { set; get; } +} + + + + + + + +/// +/// 大众看板有条码报表 +/// +//[ExcelExporter(Name = "未结明细", AutoFitAllColumn = true, MaxRowNumberOnASheet = 500000)] public class SettleSparePartExport { - [ExporterHeader(DisplayName = "行号")] - public string LineNumber { set; get; } - [ExporterHeader(DisplayName = "交货日期")] - public string WMSDeliveryDate { set; get; } + [ExporterHeader(DisplayName = "期间 ")] + public string 期间 {set;get;} + [ExporterHeader(DisplayName = "交货单号 ")] + public string 交货单号 {set;get;} + [ExporterHeader(DisplayName = "发货日期")] + public string 发货日期 {set;get;} + [ExporterHeader(DisplayName = "采购订单号")] + public string 采购订单号 {set;get;} + [ExporterHeader(DisplayName = "SAP编码")] + public string SAP编码 {set;get;} + [ExporterHeader(DisplayName = "物料代码")] + public string 物料代码 {set;get;} + [ExporterHeader(DisplayName = "物料描述")] + public string 物料描述 {set;get;} + [ExporterHeader(DisplayName = "物料组")] + public string 物料组 {set;get;} + [ExporterHeader(DisplayName = "开票单价")] + public decimal 开票单价 {set;get;} + [ExporterHeader(DisplayName = "数量差异")] + public decimal 数量差异 {set;get;} + [ExporterHeader(DisplayName = "发货数量")] + public decimal 发货数量 {set;get;} + [ExporterHeader(DisplayName = "开票数量")] + public decimal 开票数量 {set;get;} + [ExporterHeader(DisplayName = "定价")] + public decimal 定价 {set;get;} + [ExporterHeader(DisplayName = "单价差异")] + public decimal 单价差异 { set; get;} - [ExporterHeader(DisplayName = "交货单号")] - public string DeliveryOrderNo { set; get; } - [ExporterHeader(DisplayName = "订单日期")] - public DateTime OrderDate{ set; get; } - [ExporterHeader(DisplayName = "采购订单号")] - public string PurchaseOrderNo { set; get; } - [ExporterHeader(DisplayName = "SAP编码")] - public string SAPCode { set; get; } - [ExporterHeader(DisplayName = "物料代码")] - public string MaterialCode { set; get; } - [ExporterHeader(DisplayName = "物料描述")] - public string MaterialDesc { set; get; } - [ExporterHeader(DisplayName = "采购订单文本")] - public string PurchaseOrderNoText { set; get; } + //[ExporterHeader(DisplayName = "行号")] + //public string LineNumber { set; get; } - [ExporterHeader(DisplayName = "发货数量")] - public decimal ReceiptQty { set; get; } + //[ExporterHeader(DisplayName = "交货日期")] + //public string WMSDeliveryDate { set; get; } - [ExporterHeader(DisplayName = "开票数量")] - public decimal InvoicedQty { set; get; } + //[ExporterHeader(DisplayName = "交货单号")] + //public string DeliveryOrderNo { set; get; } - [ExporterHeader(DisplayName = "发货与开票差异")] - public decimal SettleInvoiceDiffQty { set; get; } + //[ExporterHeader(DisplayName = "订单日期")] + //public DateTime OrderDate{ set; get; } - [ExporterHeader(DisplayName = "开票单价")] - public decimal InvoicePrice { set; get; } + //[ExporterHeader(DisplayName = "采购订单号")] + //public string PurchaseOrderNo { set; get; } - [ExporterHeader(DisplayName = "开票金额")] - public decimal InvoiceMoney { set; get; } - [ExporterHeader(DisplayName = "定价")] - public decimal Price { set; get; } + //[ExporterHeader(DisplayName = "SAP编码")] + //public string SAPCode { set; get; } - [ExporterHeader(DisplayName = "单价差异")] - public decimal InvoiceDiffPrice { set; get; } + //[ExporterHeader(DisplayName = "物料代码")] + //public string MaterialCode { set; get; } + + //[ExporterHeader(DisplayName = "物料描述")] + //public string MaterialDesc { set; get; } + + //[ExporterHeader(DisplayName = "采购订单文本")] + //public string PurchaseOrderNoText { set; get; } + + //[ExporterHeader(DisplayName = "发货数量")] + //public decimal ReceiptQty { set; get; } + + //[ExporterHeader(DisplayName = "开票数量")] + //public decimal InvoicedQty { set; get; } + + //[ExporterHeader(DisplayName = "发货与开票差异")] + //public decimal SettleInvoiceDiffQty { set; get; } + + //[ExporterHeader(DisplayName = "开票单价")] + //public decimal InvoicePrice { set; get; } + + //[ExporterHeader(DisplayName = "开票金额")] + //public decimal InvoiceMoney { set; get; } + //[ExporterHeader(DisplayName = "定价")] + //public decimal Price { set; get; } + + //[ExporterHeader(DisplayName = "单价差异")] + //public decimal InvoiceDiffPrice { set; get; } - [ExporterHeader(DisplayName = "总金额差异")] - public decimal SumDiffMoney { set; get; } + //[ExporterHeader(DisplayName = "总金额差异")] + //public decimal SumDiffMoney { set; get; } } } diff --git a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SettleSparePartExportService.cs b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SettleSparePartExportService.cs index 81de8f03..3c5d35ff 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SettleSparePartExportService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SettleSparePartExportService.cs @@ -26,30 +26,70 @@ namespace SettleAccount.Job.Services.Report public string ExportFile(Guid id, List exportName, List p_list) { - + var fileName=exportName.FirstOrDefault(); var purchaseOrderNo = p_list.Where(p => p.Name == "PurchaseOrderNo").FirstOrDefault().Value; var version = p_list.Where(p => p.Name == "Version").FirstOrDefault().Value; var sapCode = p_list.Where(p => p.Name == "SAPCode").FirstOrDefault().Value; var matialCode = p_list.Where(p => p.Name == "MatialCode").FirstOrDefault().Value; var beginTime = p_list.Where(p => p.Name == "BegingTime").FirstOrDefault().Value; var endTime = p_list.Where(p => p.Name == "EndTime").FirstOrDefault().Value; - var _list = _dapper.GetSettleSparePartReportList(purchaseOrderNo, version, sapCode, matialCode, beginTime, endTime); - var diffList = _erpdapperRepository.GetSettleInvoiceDiff(version); + var _ls = _dapper.GetSettleSparePartReportList(purchaseOrderNo, version, sapCode, matialCode, beginTime, endTime); + var diffList = _dapper.GetSettleSparePartSumQtyDiff(version); if (diffList != null) { foreach (var itm in diffList) { - var _first = _list.FirstOrDefault(p => p.MaterialCode == itm.MaterialCode); + var _first = _ls.FirstOrDefault(p => p.采购订单号 == itm.订单号 && p.物料代码==itm.物料号); if (_first != null) { - _first.InvoicedQty = _first.InvoicedQty + itm.DiffQty;//开票数量(结算数量+差异) - _first.InvoiceMoney = Math.Round(_first.InvoicedQty * _first.InvoicePrice, 2);//开票总金额（开票数量*开票单价） - _first.SumDiffMoney = (_first.ReceiptQty * _first.Price) - _first.InvoiceMoney;//总金额差异（结算金额-开票金额） + _first.开票数量 = _first.发货数量 + itm.数量差异;//开票数量(结算数量+差异) + _first.数量差异 = itm.数量差异; + } } } - _outputService.Export(id, string.Format("大众备件结算核对明细表_{0}.xlsx", Guid.NewGuid().ToString()), _list); + //if (!string.IsNullOrEmpty(materialGroup)) + //{ + // var _groupList = materialGroup.Split(new char[] { ',' }).Distinct().ToList(); + // if (_groupList.Count() > 0) + // { + // _ls = _ls.Where(p => _groupList.Contains(p.MaterialGroup)).ToList(); + // } + //} + if (!string.IsNullOrEmpty(sapCode)) + { + var _groupList = sapCode.Split(new char[] { '\n' }).Distinct().ToList(); + if (_groupList.Count() > 0) + { + _ls = _ls.Where(p => _groupList.Contains(p.SAP编码)).ToList(); + } + } + if (!string.IsNullOrEmpty(matialCode)) + { + var _groupList = matialCode.Split(new char[] { '\n' }).Distinct().ToList(); + if (_groupList.Count() > 0) + { + _ls = _ls.Where(p => _groupList.Contains(p.物料代码)).ToList(); + } + } + if (!string.IsNullOrEmpty(purchaseOrderNo)) + { + var _groupList = purchaseOrderNo.Split(new char[] { '\n' }).Distinct().ToList(); + if (_groupList.Count() > 0) + { + _ls = _ls.Where(p => _groupList.Contains(p.采购订单号)).ToList(); + } + } + + + + + + + + + _outputService.Export(id, fileName, _ls); return id.ToString(); From 663b8d669fda71b3d7a0f66920a6ef1e8377ee3d Mon Sep 17 00:00:00 2001 From: 44673626 <44673626@qq.com> Date: Mon, 10 Jan 2022 16:13:39 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E4=B8=80=E6=B1=BD=E8=BD=BF=E8=BD=A6?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=9A=84KEY?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/SettleAccount.Job/SettleAccountJobModule.cs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/Modules/SettleAccount/src/SettleAccount.Job/SettleAccountJobModule.cs b/src/Modules/SettleAccount/src/SettleAccount.Job/SettleAccountJobModule.cs index 88b662b9..ec87041d 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Job/SettleAccountJobModule.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Job/SettleAccountJobModule.cs @@ -173,6 +173,11 @@ namespace Win.Sfs.SettleAccount { return implementationFactory.GetService(); } + //一汽轿车 + if (key.Equals(typeof(HQCarSettledDetailDiffExportService).FullName)) + { + return implementationFactory.GetService(); + } //红旗、轿车发运报表 if (key.Equals(typeof(HQMShippingExportService).FullName)) { @@ -186,6 +191,8 @@ namespace Win.Sfs.SettleAccount { return implementationFactory.GetService(); } + + else