From 362d33a69fb7a98b5b6c8cfc1460a974e4b2cbbc Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周四, 08 5月 2025 09:54:39 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application.Contracts/Dtos/Samples/SampleCreateOrUpdateDtoBase.cs | 31
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/test/CMS.Plugin.WareCmsUtilityApi.Application.Tests/CMS.Plugin.WareCmsUtilityApi.Application.Tests.csproj | 17
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi/Controller/SampleController.cs | 187 ++
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/test/CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore.Tests/CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore.Tests.csproj | 25
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application/Implements/SampleAppService.cs | 308 ++++
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain.Shared/Samples/SampleConsts.cs | 12
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Abstractions/CMS.Plugin.WareCmsUtilityApi.Abstractions.csproj | 0
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain/CMSPluginDomainModule.cs | 24
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application/CMS.Plugin.WareCmsUtilityApi.Application.csproj | 21
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Abstractions/CMSPluginWareCmsUtilityApiAbstractionsModule.cs | 8
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore/CMSPluginEntityFrameworkCoreModule.cs | 26
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/test/CMS.Plugin.WareCmsUtilityApi.TestBase/WareCmsUtilityApiTestBase.cs | 89 +
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.PostgreSql/CMSPluginDbContextFactory.cs | 43
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application.Contracts/Dtos/Samples/SamplesImportModel.cs | 34
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/README.md | 2
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.PostgreSql/FodyWeavers.xml | 0
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore/appsettings.json | 5
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/NuGet.config | 0
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/test/CMS.Plugin.WareCmsUtilityApi.Application.Tests/WareCmsUtilityApiApplicationTestModule.cs | 19
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/test/CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore.Tests/WareCmsUtilityApiTestEntityFrameworkCoreModule.cs | 50
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Abstractions/Properties/AssemblyInfo.cs | 0
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain/CMSPluginDbProperties.cs | 27
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.SqlServer/CMSPluginDbContext.cs | 48
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.PostgreSql/Scripts/UpdateDB.bat | 0
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/test/CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore.Tests/WareCmsUtilityApiEntityFrameworkTestBase.cs | 11
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/test/CMS.Plugin.WareCmsUtilityApi.TestBase/WareCmsUtilityApiTestBaseModule.cs | 63
Weben_CMS专用代码生成器/WareCmsUtilityApi/build-server.ps1 | 18
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/configureawait.props | 0
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.Sample.cs | 58
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.PostgreSql/CMS.Plugin.WareCmsUtilityApi.PostgreSql.csproj | 30
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/test/CMS.Plugin.WareCmsUtilityApi.TestBase/WareCmsUtilityApiDataSeedContributor.cs | 35
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain/Data/NullCMSPluginDbSchemaMigrator.cs | 16
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain/Samples/SampleDataSeedContributor.cs | 79 +
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi/CMSPluginModule.cs | 42
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/CMS.Plugin.WareCmsUtilityApi.sln | 144 +
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain.Shared/CMSPluginModuleExtensionConfigurator.cs | 82 +
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.MySQL/CMS.Plugin.WareCmsUtilityApi.MySQL.csproj | 30
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain.Shared/FodyWeavers.xml | 0
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi/EventHandlers/WareCmsUtilityApiEventHandler.cs | 80 +
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain/EventHandlers/SampleEventHandler.cs | 17
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore/FodyWeavers.xml | 0
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi/FlowProcessors/WareCmsUtilityApiFlowProcessor.cs | 91 +
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain/CMS.Plugin.WareCmsUtilityApi.Domain.csproj | 21
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain/Data/CMSPluginDbMigrationService.cs | 211 ++
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.MySQL/CMSPluginMySQLModule.cs | 42
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi/Jobs/WareCmsUtilityApiJob.cs | 43
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application.Contracts/Dtos/Samples/SamplesExportModel.cs | 25
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi/ProjectService/WareCmsUtilityApiProjectService.cs | 184 ++
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/delete-bin-obj-folders.bat | 0
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.SqlServer/CMS.Plugin.WareCmsUtilityApi.SqlServer.csproj | 30
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.PostgreSql/Properties/AssemblyInfo.cs | 0
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/.idea/.idea.CMS.Plugin.WareCmsUtilityApi/.idea/indexLayout.xml | 0
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application.Contracts/ICMSPluginQueryAppService.cs | 10
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application/CMSPluginQueryAppService.cs | 19
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore/CMSPluginDbSchemaMigrator.cs | 37
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/test/CMS.Plugin.WareCmsUtilityApi.Application.Tests/WareCmsUtilityApiApplicationTestBase.cs | 38
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/test/CMS.Plugin.WareCmsUtilityApi.TestBase/CMS.Plugin.WareCmsUtilityApi.TestBase.csproj | 23
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Abstractions/CMSPluginWareCmsUtilityApiExtensions.cs | 30
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain/Data/ICMSPluginDapperRepository.cs | 22
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain/Properties/AssemblyInfo.cs | 0
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/test/CMS.Plugin.WareCmsUtilityApi.Domain.Tests/WareCmsUtilityApiDomainTestBase.cs | 38
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi/Workers/WareCmsUtilityApiWorker.cs | 76 +
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application.Contracts/FodyWeavers.xml | 0
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.SqlServer/CMSPluginSqlServerModule.cs | 42
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application/CMSPluginAppService.cs | 19
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi/CMS.Plugin.WareCmsUtilityApi.csproj | 67
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.MySQL/Scripts/UpdateDB.bat | 0
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Abstractions/CMSPluginWareCmsUtilityApiFeatures.cs | 23
Weben_CMS专用代码生成器/WareCmsUtilityApi/build-web.ps1 | 16
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/Directory.Build.props | 0
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi/CMSPluginEntry.cs | 109 +
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Abstractions/IWareCmsUtilityApiFlowService.cs | 15
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain/Samples/SampleSpecification.cs | 41
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.MySQL/Scripts/UpdateMigrations.bat | 0
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application.Contracts/Dtos/Samples/GetSamplesInput.cs | 19
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Abstractions/WareCmsUtilityApiActivity.cs | 78 +
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi/appsettings.json | 6
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/test/CMS.Plugin.WareCmsUtilityApi.Domain.Tests/CMS.Plugin.WareCmsUtilityApi.Domain.Tests.csproj | 16
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain.Shared/CMS.Plugin.WareCmsUtilityApi.Domain.Shared.csproj | 28
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/test/CMS.Plugin.WareCmsUtilityApi.Domain.Tests/WareCmsUtilityApiDomainTestModule.cs | 13
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/package.reference.props | 0
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.SqlServer/Properties/AssemblyInfo.cs | 0
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.SqlServer/Scripts/UpdateDB.bat | 0
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain.Shared/Enums/WareCmsUtilityApiStatus.cs | 34
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/stylecop.json | 0
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application.Contracts/Dtos/Samples/SampleUpdateDto.cs | 14
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application/CMSPluginApplicationModule.cs | 31
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/publish.ps1 | 38
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi/CMSPluginRuntimeMigrator.cs | 46
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.PostgreSql/CMSPluginPostgreSqlModule.cs | 42
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi/Jobs/WareCmsUtilityApiArgs.cs | 18
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application/MapperProfiles/SampleAutoMapperProfile.cs | 24
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi/Apis/IWareCmsUtilityApiExternalApi.cs | 18
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/common.props | 0
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/test/CMS.Plugin.WareCmsUtilityApi.TestBase/WareCmsUtilityApiTestData.cs | 8
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain.Shared/Localization/WareCmsUtilityApiResource.cs | 11
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.PostgreSql/Scripts/UpdateMigrations.bat | 0
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application.Contracts/Dtos/Samples/SampleDto.cs | 55
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Abstractions/CMSPluginWareCmsUtilityApiOptions.cs | 16
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain/Samples/ISampleRepository.cs | 54
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application.Contracts/CMSPluginApplicationContractsModule.cs | 21
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/.idea/.idea.CMS.Plugin.WareCmsUtilityApi/.idea/encodings.xml | 0
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi/Properties/launchSettings.json | 0
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.MySQL/CMSPluginDbContextFactory.cs | 43
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain.Shared/Localization/WareCmsUtilityApi/zh-Hans.json | 7
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi/Flows/50001_1.pfd | 158 ++
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore/Properties/AssemblyInfo.cs | 0
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi/Resources/Templates/Sample导出模板.xlsx | 0
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain.Shared/CMSPluginDomainSharedModule.cs | 41
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.PostgreSql/CMSPluginDbContext.cs | 48
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Abstractions/FodyWeavers.xml | 0
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application/Properties/AssemblyInfo.cs | 0
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain/FodyWeavers.xml | 0
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain/Samples/Sample.cs | 95 +
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain.Shared/Localization/WareCmsUtilityApi/en.json | 7
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain/Settings/CMSPluginSettingDefinitionProvider.cs | 27
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.MySQL/Properties/AssemblyInfo.cs | 0
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore/CMSPluginEfCoreEntityExtensionMappings.cs | 47
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Abstractions/CMSPluginWareCmsUtilityApiSettings.cs | 23
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application.Contracts/Services/ISampleAppService.cs | 46
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain.Shared/Samples/SampleEto.cs | 22
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.MySQL/FodyWeavers.xml | 0
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application.Contracts/CMSPluginDtoExtensions.cs | 32
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.SqlServer/CMSPluginDbContextFactory.cs | 43
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi/Flows/FlowInfo.xml | 0
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi/FodyWeavers.xml | 0
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application.Contracts/Dtos/Samples/SampleCreateDto.cs | 17
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application/FodyWeavers.xml | 0
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain.Shared/CMSPluginDomainErrorCodes.cs | 16
/dev/null | 8
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore/Repositories/EfCoreSampleRepository.cs | 79 +
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/common.test.props | 0
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi/Services/WareCmsUtilityApiFlowService.cs | 43
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore/CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore.csproj | 19
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore/CMSPluginDapperRepository.cs | 18
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain/Data/ICMSPluginDbSchemaMigrator.cs | 12
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/.idea/.idea.CMS.Plugin.WareCmsUtilityApi/.idea/vcs.xml | 0
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore/ICMSPluginDbContext.cs | 14
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application.Contracts/CMS.Plugin.WareCmsUtilityApi.Application.Contracts.csproj | 21
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/doc/Domain-Drive-Design.md | 0
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.SqlServer/Scripts/UpdateMigrations.bat | 0
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.MySQL/CMSPluginDbContext.cs | 48
Weben_CMS专用代码生成器/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.SqlServer/FodyWeavers.xml | 0
143 files changed, 4,469 insertions(+), 8 deletions(-)
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/CMS.Plugin.UtilityApi.sln" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/CMS.Plugin.UtilityApi.sln"
deleted file mode 100644
index 8dd9b35..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/CMS.Plugin.UtilityApi.sln"
+++ /dev/null
@@ -1,144 +0,0 @@
-锘�
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.4.33110.190
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "瑙ｅ喅鏂规椤�", "瑙ｅ喅鏂规椤�", "{28C418E6-AF1D-4B74-ACDF-7B81FA4C256E}"
- ProjectSection(SolutionItems) = preProject
- .editorconfig = .editorconfig
- .gitignore = .gitignore
- common.props = common.props
- common.test.props = common.test.props
- configureawait.props = configureawait.props
- delete-bin-obj-folders.bat = delete-bin-obj-folders.bat
- Directory.Build.props = Directory.Build.props
- NuGet.config = NuGet.config
- package.reference.props = package.reference.props
- publish.ps1 = publish.ps1
- README.md = README.md
- stylecop.json = stylecop.json
- EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{19F68F40-2A05-48EB-86F0-56928B3CCE9C}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{5632E2B3-5592-4C6A-9493-768E5B04804D}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CMS.Plugin.UtilityApi", "src\CMS.Plugin.HIAWms\CMS.Plugin.UtilityApi.csproj", "{9926DE4C-376D-487E-9C64-494913D94379}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CMS.Plugin.HIAWms.EntityFrameworkCore", "src\CMS.Plugin.HIAWms.EntityFrameworkCore\CMS.Plugin.HIAWms.EntityFrameworkCore.csproj", "{0022A80F-6D52-4B58-B2B3-F029DB4AEC0A}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CMS.Plugin.HIAWms.Domain", "src\CMS.Plugin.HIAWms.Domain\CMS.Plugin.HIAWms.Domain.csproj", "{8B2BED13-2B0E-49B5-8B0A-F272D27B2F37}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CMS.Plugin.HIAWms.Domain.Shared", "src\CMS.Plugin.HIAWms.Domain.Shared\CMS.Plugin.HIAWms.Domain.Shared.csproj", "{F405C633-8100-49B8-A270-D5340A165742}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CMS.Plugin.HIAWms.Application.Contracts", "src\CMS.Plugin.HIAWms.Application.Contracts\CMS.Plugin.HIAWms.Application.Contracts.csproj", "{D65BB57E-618A-468C-AA28-BD8C9EBF0AF2}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CMS.Plugin.HIAWms.Application", "src\CMS.Plugin.HIAWms.Application\CMS.Plugin.HIAWms.Application.csproj", "{02CB86F3-E614-4193-8B7F-C2FB665C8A5A}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "doc", "doc", "{A68B3B6B-DDE8-431E-90F3-A9FEE1D14A53}"
- ProjectSection(SolutionItems) = preProject
- doc\Domain-Drive-Design.md = doc\Domain-Drive-Design.md
- EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CMS.Plugin.HIAWms.TestBase", "test\CMS.Plugin.HIAWms.TestBase\CMS.Plugin.HIAWms.TestBase.csproj", "{33999EE8-73A1-4CF2-BDFD-CE353B05A727}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CMS.Plugin.HIAWms.EntityFrameworkCore.Tests", "test\CMS.Plugin.HIAWms.EntityFrameworkCore.Tests\CMS.Plugin.HIAWms.EntityFrameworkCore.Tests.csproj", "{C6AFC427-C51D-4BD2-BBA6-8841D3495077}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CMS.Plugin.HIAWms.Domain.Tests", "test\CMS.Plugin.HIAWms.Domain.Tests\CMS.Plugin.HIAWms.Domain.Tests.csproj", "{74E86B03-F185-47B2-A4C3-04C1CEC84F14}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CMS.Plugin.HIAWms.Application.Tests", "test\CMS.Plugin.HIAWms.Application.Tests\CMS.Plugin.HIAWms.Application.Tests.csproj", "{731DE36F-27F5-48B8-865D-DA43C8910010}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CMS.Plugin.HIAWms.Abstractions", "src\CMS.Plugin.HIAWms.Abstractions\CMS.Plugin.HIAWms.Abstractions.csproj", "{87D957E4-FE12-4432-9B7B-827A98DD41D1}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CMS.Plugin.HIAWms.MySQL", "src\CMS.Plugin.HIAWms.MySQL\CMS.Plugin.HIAWms.MySQL.csproj", "{2F71D6DF-F19A-410C-BD79-F2F871E63902}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CMS.Plugin.HIAWms.PostgreSql", "src\CMS.Plugin.HIAWms.PostgreSql\CMS.Plugin.HIAWms.PostgreSql.csproj", "{698D9FFA-080C-4F22-9FBF-B9509B28A954}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CMS.Plugin.HIAWms.SqlServer", "src\CMS.Plugin.HIAWms.SqlServer\CMS.Plugin.HIAWms.SqlServer.csproj", "{521D17FF-BD3A-43B4-9BEE-183FDE3522F4}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Any CPU = Debug|Any CPU
- Release|Any CPU = Release|Any CPU
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {9926DE4C-376D-487E-9C64-494913D94379}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {9926DE4C-376D-487E-9C64-494913D94379}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {9926DE4C-376D-487E-9C64-494913D94379}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {9926DE4C-376D-487E-9C64-494913D94379}.Release|Any CPU.Build.0 = Release|Any CPU
- {0022A80F-6D52-4B58-B2B3-F029DB4AEC0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {0022A80F-6D52-4B58-B2B3-F029DB4AEC0A}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {0022A80F-6D52-4B58-B2B3-F029DB4AEC0A}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {0022A80F-6D52-4B58-B2B3-F029DB4AEC0A}.Release|Any CPU.Build.0 = Release|Any CPU
- {8B2BED13-2B0E-49B5-8B0A-F272D27B2F37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {8B2BED13-2B0E-49B5-8B0A-F272D27B2F37}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {8B2BED13-2B0E-49B5-8B0A-F272D27B2F37}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {8B2BED13-2B0E-49B5-8B0A-F272D27B2F37}.Release|Any CPU.Build.0 = Release|Any CPU
- {F405C633-8100-49B8-A270-D5340A165742}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {F405C633-8100-49B8-A270-D5340A165742}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {F405C633-8100-49B8-A270-D5340A165742}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {F405C633-8100-49B8-A270-D5340A165742}.Release|Any CPU.Build.0 = Release|Any CPU
- {D65BB57E-618A-468C-AA28-BD8C9EBF0AF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {D65BB57E-618A-468C-AA28-BD8C9EBF0AF2}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {D65BB57E-618A-468C-AA28-BD8C9EBF0AF2}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {D65BB57E-618A-468C-AA28-BD8C9EBF0AF2}.Release|Any CPU.Build.0 = Release|Any CPU
- {02CB86F3-E614-4193-8B7F-C2FB665C8A5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {02CB86F3-E614-4193-8B7F-C2FB665C8A5A}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {02CB86F3-E614-4193-8B7F-C2FB665C8A5A}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {02CB86F3-E614-4193-8B7F-C2FB665C8A5A}.Release|Any CPU.Build.0 = Release|Any CPU
- {33999EE8-73A1-4CF2-BDFD-CE353B05A727}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {33999EE8-73A1-4CF2-BDFD-CE353B05A727}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {33999EE8-73A1-4CF2-BDFD-CE353B05A727}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {33999EE8-73A1-4CF2-BDFD-CE353B05A727}.Release|Any CPU.Build.0 = Release|Any CPU
- {C6AFC427-C51D-4BD2-BBA6-8841D3495077}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {C6AFC427-C51D-4BD2-BBA6-8841D3495077}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {C6AFC427-C51D-4BD2-BBA6-8841D3495077}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {C6AFC427-C51D-4BD2-BBA6-8841D3495077}.Release|Any CPU.Build.0 = Release|Any CPU
- {74E86B03-F185-47B2-A4C3-04C1CEC84F14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {74E86B03-F185-47B2-A4C3-04C1CEC84F14}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {74E86B03-F185-47B2-A4C3-04C1CEC84F14}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {74E86B03-F185-47B2-A4C3-04C1CEC84F14}.Release|Any CPU.Build.0 = Release|Any CPU
- {731DE36F-27F5-48B8-865D-DA43C8910010}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {731DE36F-27F5-48B8-865D-DA43C8910010}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {731DE36F-27F5-48B8-865D-DA43C8910010}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {731DE36F-27F5-48B8-865D-DA43C8910010}.Release|Any CPU.Build.0 = Release|Any CPU
- {87D957E4-FE12-4432-9B7B-827A98DD41D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {87D957E4-FE12-4432-9B7B-827A98DD41D1}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {87D957E4-FE12-4432-9B7B-827A98DD41D1}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {87D957E4-FE12-4432-9B7B-827A98DD41D1}.Release|Any CPU.Build.0 = Release|Any CPU
- {2F71D6DF-F19A-410C-BD79-F2F871E63902}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {2F71D6DF-F19A-410C-BD79-F2F871E63902}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {2F71D6DF-F19A-410C-BD79-F2F871E63902}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {2F71D6DF-F19A-410C-BD79-F2F871E63902}.Release|Any CPU.Build.0 = Release|Any CPU
- {698D9FFA-080C-4F22-9FBF-B9509B28A954}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {698D9FFA-080C-4F22-9FBF-B9509B28A954}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {698D9FFA-080C-4F22-9FBF-B9509B28A954}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {698D9FFA-080C-4F22-9FBF-B9509B28A954}.Release|Any CPU.Build.0 = Release|Any CPU
- {521D17FF-BD3A-43B4-9BEE-183FDE3522F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {521D17FF-BD3A-43B4-9BEE-183FDE3522F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {521D17FF-BD3A-43B4-9BEE-183FDE3522F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {521D17FF-BD3A-43B4-9BEE-183FDE3522F4}.Release|Any CPU.Build.0 = Release|Any CPU
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
- GlobalSection(NestedProjects) = preSolution
- {9926DE4C-376D-487E-9C64-494913D94379} = {19F68F40-2A05-48EB-86F0-56928B3CCE9C}
- {0022A80F-6D52-4B58-B2B3-F029DB4AEC0A} = {19F68F40-2A05-48EB-86F0-56928B3CCE9C}
- {8B2BED13-2B0E-49B5-8B0A-F272D27B2F37} = {19F68F40-2A05-48EB-86F0-56928B3CCE9C}
- {F405C633-8100-49B8-A270-D5340A165742} = {19F68F40-2A05-48EB-86F0-56928B3CCE9C}
- {D65BB57E-618A-468C-AA28-BD8C9EBF0AF2} = {19F68F40-2A05-48EB-86F0-56928B3CCE9C}
- {02CB86F3-E614-4193-8B7F-C2FB665C8A5A} = {19F68F40-2A05-48EB-86F0-56928B3CCE9C}
- {33999EE8-73A1-4CF2-BDFD-CE353B05A727} = {5632E2B3-5592-4C6A-9493-768E5B04804D}
- {C6AFC427-C51D-4BD2-BBA6-8841D3495077} = {5632E2B3-5592-4C6A-9493-768E5B04804D}
- {74E86B03-F185-47B2-A4C3-04C1CEC84F14} = {5632E2B3-5592-4C6A-9493-768E5B04804D}
- {731DE36F-27F5-48B8-865D-DA43C8910010} = {5632E2B3-5592-4C6A-9493-768E5B04804D}
- {87D957E4-FE12-4432-9B7B-827A98DD41D1} = {19F68F40-2A05-48EB-86F0-56928B3CCE9C}
- {2F71D6DF-F19A-410C-BD79-F2F871E63902} = {19F68F40-2A05-48EB-86F0-56928B3CCE9C}
- {698D9FFA-080C-4F22-9FBF-B9509B28A954} = {19F68F40-2A05-48EB-86F0-56928B3CCE9C}
- {521D17FF-BD3A-43B4-9BEE-183FDE3522F4} = {19F68F40-2A05-48EB-86F0-56928B3CCE9C}
- EndGlobalSection
- GlobalSection(ExtensibilityGlobals) = postSolution
- SolutionGuid = {220123E7-A888-4DE7-8F9A-8FE271543889}
- EndGlobalSection
-EndGlobal
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/README.md" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/README.md"
deleted file mode 100644
index 0d362f3..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/README.md"
+++ /dev/null
@@ -1,2 +0,0 @@
-# HIAWms
-
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/publish.ps1" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/publish.ps1"
deleted file mode 100644
index 21763a8..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/publish.ps1"
+++ /dev/null
@@ -1,38 +0,0 @@
-# publishFolder
-$publishFolder= $args[0]
-
-# Paths
-$rootFolder = (Get-Item -Path "./" -Verbose).FullName
-if ([String]::IsNullOrEmpty($publishFolder)) {
- $publishFolder = Join-Path $rootFolder "output/publish"
- $hasPath = Test-Path($publishFolder)
- if (-Not $hasPath) {
- new-item -path $rootFolder -name "output/publish" -type directory
- }
-}
-Write-Host ("Publish Output " + $publishFolder)
-
-# List of projects
-$projects = (
- "src/CMS.Plugin.HIAWms"
-)
-
-# Rebuild solution
-Set-Location $rootFolder
-dotnet restore -s https://nexus.sycdev.com/repository/nuget-hosted/ --runtime win-x64
-# dotnet restore --configfile NuGet.config --runtime win-x64
-Write-Host ("Restore Completed ! ")
-# Publish all projects
-foreach($project in $projects) {
- $projectFolder = Join-Path $rootFolder $project
- $projectName = $project.Substring($project.LastIndexOf("/") + 1)
- Set-Location $projectFolder
- Write-Host ("Publish " + $projectName)
- # & dotnet publish ($projectName + ".csproj ") --configuration Release --output (Join-Path $publishFolder ("/" + $projectName.ToLower())) --nologo --verbosity quiet --no-restore
- & dotnet publish ($projectName + ".csproj ") --configuration Release --output (Join-Path $publishFolder ("/" + $projectName.ToLower())) --nologo --verbosity quiet --no-restore --runtime win-x64
-}
-
-Write-Host ("Publish Completed ! ")
-
-# Go back to the root folder
-Set-Location $rootFolder
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Abstractions/CMSPluginHIAWmsAbstractionsModule.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Abstractions/CMSPluginHIAWmsAbstractionsModule.cs"
deleted file mode 100644
index 2d0832a..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Abstractions/CMSPluginHIAWmsAbstractionsModule.cs"
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace CMS.Plugin.HIAWms.Abstractions;
-
-/// <summary>
-/// 娴佺▼涓氬姟鎵╁睍妯″潡
-/// </summary>
-public class CMSPluginHIAWmsAbstractionsModule
-{
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Abstractions/CMSPluginHIAWmsExtensions.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Abstractions/CMSPluginHIAWmsExtensions.cs"
deleted file mode 100644
index ec752e7..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Abstractions/CMSPluginHIAWmsExtensions.cs"
+++ /dev/null
@@ -1,30 +0,0 @@
-using Microsoft.Extensions.DependencyInjection;
-
-namespace CMS.Plugin.HIAWms.Abstractions
-{
- /// <summary>
- /// 鎵╁睍鏂规硶
- /// </summary>
- public static class CMSPluginHIAWmsExtensions
- {
- /// <summary>
- /// Tries the add setting management.
- /// </summary>
- /// <param name="services">The services.</param>
- /// <param name="configureOptions">The configure options.</param>
- /// <returns></returns>
- public static IServiceCollection TryAddHIAWms(this IServiceCollection services, Action<CMSPluginHIAWmsOptions>? configureOptions = null)
- {
- if (configureOptions == null)
- {
- services.AddOptions().Configure<CMSPluginHIAWmsOptions>(options => {});
- }
- else
- {
- services.AddOptions().PostConfigure(configureOptions);
- }
-
- return services;
- }
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Abstractions/CMSPluginHIAWmsFeatures.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Abstractions/CMSPluginHIAWmsFeatures.cs"
deleted file mode 100644
index 050a6d2..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Abstractions/CMSPluginHIAWmsFeatures.cs"
+++ /dev/null
@@ -1,23 +0,0 @@
-namespace CMS.Plugin.HIAWms.Abstractions
-{
- /// <summary>
- /// 鍔熻兘瀹氫箟.
- /// </summary>
- public class CMSPluginHIAWmsFeatures
- {
- /// <summary>
- /// The prefix
- /// </summary>
- private const string Prefix = "LMES";
-
- /// <summary>
- /// GroupName
- /// </summary>
- public const string GroupName = Prefix + ".HIAWms";
-
- /// <summary>
- /// 鏄惁寮�鍚�
- /// </summary>
- public const string Enable = GroupName + ".Enable";
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Abstractions/CMSPluginHIAWmsOptions.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Abstractions/CMSPluginHIAWmsOptions.cs"
deleted file mode 100644
index 3465a0f..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Abstractions/CMSPluginHIAWmsOptions.cs"
+++ /dev/null
@@ -1,16 +0,0 @@
-using CMS.Plugin.MesSuite.Abstractions.Models;
-
-namespace CMS.Plugin.HIAWms.Abstractions
-{
- public class CMSPluginHIAWmsOptions
- {
- public CMSPluginHIAWmsOptions()
- {
- }
-
- /// <summary>
- /// 鎵╁睍灞炴��
- /// </summary>
- public List<ExtraProperty> ExtraProperties { get; set; } = new();
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Abstractions/CMSPluginHIAWmsSettings.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Abstractions/CMSPluginHIAWmsSettings.cs"
deleted file mode 100644
index 529e94d..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Abstractions/CMSPluginHIAWmsSettings.cs"
+++ /dev/null
@@ -1,23 +0,0 @@
-namespace CMS.Plugin.HIAWms.Abstractions
-{
- /// <summary>
- /// CMSSettingNames
- /// </summary>
- public static class CMSPluginHIAWmsSettings
- {
- /// <summary>
- /// The prefix
- /// </summary>
- private const string Prefix = "SCMS";
-
- /// <summary>
- /// The application settings prefix
- /// </summary>
- private const string AppSettingsPrefix = Prefix + ".AppSettings";
-
- /// <summary>
- /// 缁勪欢鐘舵�侊細0=鍏抽棴,1=寮�鍚�
- /// </summary>
- public const string PluginState = AppSettingsPrefix + ".HIAWms.PluginState";
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Abstractions/HIAWmsActivity.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Abstractions/HIAWmsActivity.cs"
deleted file mode 100644
index 7f34cb0..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Abstractions/HIAWmsActivity.cs"
+++ /dev/null
@@ -1,78 +0,0 @@
-using System.ComponentModel;
-using System.Runtime.Serialization;
-using CMS.Plugin.FlowManagement.Abstractions.Enums;
-using CMS.Plugin.FlowManagement.Abstractions.FlowBusiness.Activitys;
-using CMS.Plugin.MesSuite.Abstractions.Models;
-using CMS.Plugin.OrderManagement.Abstractions.Models;
-using CMS.Plugin.ProcessManagement.Abstractions.Models;
-using CMS.Plugin.TraceManagement.Abstractions.Models.Traces;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using SYC.Flow.Kernel;
-
-namespace CMS.Plugin.HIAWms.Abstractions
-{
- /// <summary>
- /// HIAWms 涓氬姟姝ラ
- /// </summary>
- [Design("HIAWms", "HIAWms 涓氬姟姝ラ", Sort = 99), Category("瀹氬埗姝ラ")]
- [Serializable]
- public class HIAWmsActivity : BusinessActivity
- {
- /// <summary>
- /// 閰嶇疆灞炴��1
- /// </summary>
- [Design("閰嶇疆灞炴��1", "閰嶇疆灞炴��1", Sort = 1), Category("閰嶇疆淇℃伅")]
- [DataMember]
- public string MyProperty1 { get; set; }
-
- /// <summary>
- /// 閰嶇疆灞炴��2
- /// </summary>
- [Design("閰嶇疆灞炴��2", "閰嶇疆灞炴��2", Sort = 2), Category("閰嶇疆淇℃伅")]
- [DataMember]
- public int MyProperty2 { get; set; }
-
- /// <summary>
- /// 娴佺▼涓婁笅鏂囨爣璇嗛泦鍚�
- /// </summary>
- public override List<FlowItemKey> FlowItemKeys => GetFlowItemKeys();
-
- /// <summary>
- /// 宸ヨ壓娴佺▼澶勭悊
- /// </summary>
- public override async Task ProcessAsync(ProcessflowEventArgs args)
- {
- // 宸ヨ壓妯″瀷
- var processModel = Flow.DataItems.ApplicationData as ProcessModel;
-
- // 宸ュ崟妯″瀷
- var orderModel = Flow.DataItems[FlowItemCollection.OrderModel] as OrderModel;
-
- // 浜у搧妯″瀷
- var productModel = Flow.DataItems[FlowItemCollection.ProductModel] as AssociationProductModel;
-
- // 杩芥函妯″瀷
- var traceModel = Flow.DataItems[FlowItemCollection.TraceModel] as TraceModel;
-
- Flow.Logger.LogInformation($"鎵ц娴佺▼锛氬疄渚�={Flow.Instance.ProcID} -> {Flow.Name} -> {Name} HIAWmsActivity");
-
- // 涓氬姟澶勭悊
- // 鐢变簬ServiceProvider鏉ユ簮浜嶧low缁勪欢锛屾澶勯渶鍏变韩CMS.Plugin.HIAWms.Abstractions绋嬪簭闆嗭紝鍚﹀垯鏃犳硶璋冪敤锛屼慨鏀笴MS.Plugin.HIAWms椤圭洰涓殑CMSPluginModule.cs鏂囦欢锛屽彇娑堟敞閲奊etSharedAssemblies()鏂规硶
- var hiawmsFlowService = Flow.ServiceProvider.GetService<IHIAWmsFlowService>();
- if (hiawmsFlowService != null)
- {
- await hiawmsFlowService.ProcessAsync(args);
- }
- }
-
- /// <summary>
- /// Gets the flow item keys.
- /// </summary>
- protected virtual List<FlowItemKey> GetFlowItemKeys()
- {
- var result = new List<FlowItemKey>();
- return result;
- }
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Abstractions/IHIAWmsFlowService.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Abstractions/IHIAWmsFlowService.cs"
deleted file mode 100644
index 665760d..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Abstractions/IHIAWmsFlowService.cs"
+++ /dev/null
@@ -1,15 +0,0 @@
-using SYC.Flow.Kernel;
-
-namespace CMS.Plugin.HIAWms.Abstractions
-{
- /// <summary>
- /// HIAWms 娴佺▼鏈嶅姟
- /// </summary>
- public interface IHIAWmsFlowService
- {
- /// <summary>
- /// 宸ヨ壓娴佺▼澶勭悊
- /// </summary>
- Task ProcessAsync(ProcessflowEventArgs args);
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/CMS.Plugin.HIAWms.Application.Contracts.csproj" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/CMS.Plugin.HIAWms.Application.Contracts.csproj"
deleted file mode 100644
index 7fcf052..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/CMS.Plugin.HIAWms.Application.Contracts.csproj"
+++ /dev/null
@@ -1,27 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
- <Import Project="../../common.props" />
- <Import Project="../../configureawait.props" />
-
- <PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
- <GenerateDocumentationFile>True</GenerateDocumentationFile>
- </PropertyGroup>
-
- <ItemGroup>
- <PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="$(ABPPackageVersion)" />
- <PackageReference Include="Volo.Abp.Authorization.Abstractions" Version="$(ABPPackageVersion)" />
- <PackageReference Include="MiniExcel" Version="1.31.3" />
- </ItemGroup>
-
- <ItemGroup>
- <ProjectReference Include="..\CMS.Plugin.HIAWms.Domain.Shared\CMS.Plugin.HIAWms.Domain.Shared.csproj" />
- </ItemGroup>
-
- <ItemGroup>
- <Reference Include="CmsQueryExtensions">
- <HintPath>..\..\..\..\..\CommonDLL\CmsQueryExtensions.dll</HintPath>
- </Reference>
- </ItemGroup>
-
-</Project>
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/CMSPluginApplicationContractsModule.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/CMSPluginApplicationContractsModule.cs"
deleted file mode 100644
index ab20de8..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/CMSPluginApplicationContractsModule.cs"
+++ /dev/null
@@ -1,21 +0,0 @@
-using CMS.Plugin.HIAWms.Domain.Shared;
-using Volo.Abp.Application;
-using Volo.Abp.Modularity;
-
-namespace CMS.Plugin.HIAWms.Application.Contracts;
-
-/// <summary>
-/// 鎻掍欢搴旂敤鏈嶅姟濂戠害妯″潡
-/// </summary>
-[DependsOn(
- typeof(CMSPluginDomainSharedModule),
- typeof(AbpDddApplicationContractsModule)
-)]
-public class CMSPluginApplicationContractsModule : AbpModule
-{
- /// <inheritdoc />
- public override void PreConfigureServices(ServiceConfigurationContext context)
- {
- CMSPluginDtoExtensions.Configure();
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/CMSPluginDtoExtensions.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/CMSPluginDtoExtensions.cs"
deleted file mode 100644
index 5bea721..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/CMSPluginDtoExtensions.cs"
+++ /dev/null
@@ -1,32 +0,0 @@
-using Volo.Abp.Threading;
-
-namespace CMS.Plugin.HIAWms.Application.Contracts;
-
-/// <summary>
-/// Dto鎵╁睍
-/// </summary>
-public static class CMSPluginDtoExtensions
-{
- private static readonly OneTimeRunner OneTimeRunner = new OneTimeRunner();
-
- /// <summary>
- /// Configures this instance.
- /// </summary>
- public static void Configure()
- {
- OneTimeRunner.Run(() =>
- {
- /* You can add extension properties to DTOs
- * defined in the depended modules.
- *
- * Example:
- *
- * ObjectExtensionManager.Instance
- * .AddOrUpdateProperty<IdentityRoleDto, string>("Title");
- *
- * See the documentation for more:
- * https://docs.abp.io/en/abp/latest/Object-Extensions
- */
- });
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsAreas/GetWmsAreasInput.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsAreas/GetWmsAreasInput.cs"
deleted file mode 100644
index a8f4ccc..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsAreas/GetWmsAreasInput.cs"
+++ /dev/null
@@ -1,50 +0,0 @@
-using CMS.Plugin.HIAWms.Domain.Shared.Enums;
-using Volo.Abp.Application.Dtos;
-
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsAreas;
-
-/// <summary>
-/// WmsArea鏌ヨ鍙傛暟瀵硅薄
-/// </summary>
-public class GetWmsAreasInput : ExtensiblePagedAndSortedResultRequestDto
-{
- /// <summary>
- /// Gets or sets the filter.
- /// </summary>
- public string Filter { get; set; }
-
- /// <summary>
- /// Gets or sets the name.
- /// </summary>
- public string Name { get; set; }
-
- /// <summary>
- /// 搴撳尯缂栧彿
- /// </summary>
- public string AreaNo { get; set; }
-
- /// <summary>
- /// 搴撳尯鍚嶇О
- /// </summary>
- public string AreaName { get; set; }
-
- /// <summary>
- /// 鎻忚堪
- /// </summary>
- public string? AreaDesc { get; set; }
-
- /// <summary>
- /// 搴撳尯鐘舵��
- /// </summary>
- public AreaStatusEnum AreaStatus { get; set; }
-
- /// <summary>
- /// 搴撳尯绫诲瀷
- /// </summary>
- public AreaTypeEnum AreaType { get; set; }
-
- /// <summary>
- /// 浠撳簱浠ｇ爜
- /// </summary>
- public string? StoreCode { get; set; }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsAreas/WmsAreaCreateDto.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsAreas/WmsAreaCreateDto.cs"
deleted file mode 100644
index eaa43d2..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsAreas/WmsAreaCreateDto.cs"
+++ /dev/null
@@ -1,17 +0,0 @@
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsAreas;
-
-/// <summary>
-/// WmsArea鍒涘缓鍙傛暟瀵硅薄
-/// </summary>
-public class WmsAreaCreateDto : WmsAreaCreateOrUpdateDtoBase
-{
- /// <summary>
- /// 鎺掑簭
- /// </summary>
- public virtual int? Sort { get; set; }
-
- /// <summary>
- /// 鏄惁绂佺敤
- /// </summary>
- public bool? IsDisabled { get; set; } = false;
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsAreas/WmsAreaCreateOrUpdateDtoBase.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsAreas/WmsAreaCreateOrUpdateDtoBase.cs"
deleted file mode 100644
index 632c8e7..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsAreas/WmsAreaCreateOrUpdateDtoBase.cs"
+++ /dev/null
@@ -1,89 +0,0 @@
-using CMS.Plugin.HIAWms.Domain.Shared.Enums;
-using Volo.Abp.Application.Dtos;
-
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsAreas;
-
-/// <summary>
-/// WmsArea鍒涘缓鎴栨洿鏂板熀绫�
-/// </summary>
-public abstract class WmsAreaCreateOrUpdateDtoBase : ExtensibleEntityDto
-{
- /// <summary>
- /// 搴撳尯缂栧彿
- /// </summary>
- public string AreaNo { get; set; }
-
- /// <summary>
- /// 搴撳尯鍚嶇О
- /// </summary>
- public string AreaName { get; set; }
-
- /// <summary>
- /// 鎻忚堪
- /// </summary>
- public string? AreaDesc { get; set; }
-
- /// <summary>
- /// 搴撳尯鐘舵��
- /// </summary>
- public AreaStatusEnum AreaStatus { get; set; }
-
- /// <summary>
- /// 搴撳尯绫诲瀷
- /// </summary>
- public AreaTypeEnum AreaType { get; set; }
-
- /// <summary>
- /// 浠撳簱浠ｇ爜
- /// </summary>
- public string? StoreCode { get; set; }
-
- /// <summary>
- /// 浠撳簱鍚嶇О
- /// </summary>
- public string? StoreName { get; set; }
-
- /// <summary>
- /// 鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ��
- /// </summary>
- public string RedundantField1 { get; set; }
-
- /// <summary>
- /// 鍐椾綑瀛楁2 - 棰勭暀鎵╁睍鐢ㄩ��
- /// </summary>
- public string RedundantField2 { get; set; }
-
- /// <summary>
- /// 鍐椾綑瀛楁3 - 棰勭暀鎵╁睍鐢ㄩ��
- /// </summary>
- public string RedundantField3 { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- public virtual string Remark { get; set; }
-
- /// <summary>
- /// Initializes a new instance of the <see cref="WmsAreaCreateOrUpdateDtoBase"/> class.
- /// </summary>
- public WmsAreaCreateOrUpdateDtoBase() : base(false)
- {
- }
-
-
- /// <summary>
- /// 搴撳尯鍒楄〃
- /// </summary>
- public class AreaForListOuptut
- {
- /// <summary>
- /// 搴撳尯缂栧彿
- /// </summary>
- public string AreaNo { get; set; }
-
- /// <summary>
- /// 搴撳尯鍚嶇О
- /// </summary>
- public string AreaName { get; set; }
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsAreas/WmsAreaDto.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsAreas/WmsAreaDto.cs"
deleted file mode 100644
index 9d5615c..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsAreas/WmsAreaDto.cs"
+++ /dev/null
@@ -1,108 +0,0 @@
-using CMS.Plugin.HIAWms.Domain.Shared.Enums;
-using Volo.Abp.Application.Dtos;
-using Volo.Abp.Domain.Entities;
-
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsAreas;
-
-/// <summary>
-/// WmsArea鏁版嵁鍙傛暟瀵硅薄
-/// </summary>
-public class WmsAreaDto : ExtensibleEntityDto<Guid>, IHasConcurrencyStamp
-{
- /// <summary>
- /// 搴撳尯缂栧彿
- /// </summary>
- public string AreaNo { get; set; }
-
- /// <summary>
- /// 搴撳尯鍚嶇О
- /// </summary>
- public string AreaName { get; set; }
-
- /// <summary>
- /// 鎻忚堪
- /// </summary>
- public string? AreaDesc { get; set; }
-
- /// <summary>
- /// 搴撳尯鐘舵��
- /// </summary>
- public AreaStatusEnum AreaStatus { get; set; }
-
- /// <summary>
- /// 搴撳尯鐘舵��
- /// </summary>
- public string AreaStatusDesc
- {
- get
- {
- return GetEnumDescriptionUtil.GetEnumDescription(AreaStatus);
- }
- }
-
- /// <summary>
- /// 搴撳尯绫诲瀷
- /// </summary>
- public AreaTypeEnum AreaType { get; set; }
-
- /// <summary>
- /// 搴撳尯鐘舵��
- /// </summary>
- public string AreaTypeDesc
- {
- get
- {
- return GetEnumDescriptionUtil.GetEnumDescription(AreaType);
- }
- }
-
- /// <summary>
- /// 鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ��
- /// </summary>
- public string RedundantField1 { get; set; }
-
- /// <summary>
- /// 鍐椾綑瀛楁2 - 棰勭暀鎵╁睍鐢ㄩ��
- /// </summary>
- public string RedundantField2 { get; set; }
-
- /// <summary>
- /// 鍐椾綑瀛楁3 - 棰勭暀鎵╁睍鐢ㄩ��
- /// </summary>
- public string RedundantField3 { get; set; }
-
- /// <summary>
- /// 鎺掑簭
- /// </summary>
- public virtual int Sort { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- public virtual string Remark { get; set; }
-
- /// <summary>
- /// 鏄惁绂佺敤
- /// </summary>
- public virtual bool? IsDisabled { get; set; }
-
- /// <summary>
- /// 骞跺彂鎴�
- /// </summary>
- public string ConcurrencyStamp { get; set; }
-
- /// <summary>
- /// Gets the export data.
- /// </summary>
- /// <returns></returns>
- public Dictionary<string, object> GetExportData()
- {
- var exportData = new Dictionary<string, object>();
- foreach (var property in this.GetType().GetProperties())
- {
- exportData.Add(property.Name, property.GetValue(this));
- }
-
- return exportData;
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsAreas/WmsAreaUpdateDto.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsAreas/WmsAreaUpdateDto.cs"
deleted file mode 100644
index 972ed36..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsAreas/WmsAreaUpdateDto.cs"
+++ /dev/null
@@ -1,14 +0,0 @@
-using Volo.Abp.Domain.Entities;
-
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsAreas;
-
-/// <summary>
-/// WmsArea鏇存柊鍙傛暟瀵硅薄
-/// </summary>
-public class WmsAreaUpdateDto : WmsAreaCreateOrUpdateDtoBase, IHasConcurrencyStamp
-{
- /// <summary>
- /// 骞跺彂鎴�
- /// </summary>
- public string ConcurrencyStamp { get; set; }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsAreas/WmsAreasExportModel.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsAreas/WmsAreasExportModel.cs"
deleted file mode 100644
index d0d841b..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsAreas/WmsAreasExportModel.cs"
+++ /dev/null
@@ -1,89 +0,0 @@
-using CMS.Plugin.HIAWms.Domain.Shared.Enums;
-using MiniExcelLibs.Attributes;
-
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsAreas
-{
- /// <summary>
- /// WmsAreas瀵煎嚭妯″瀷
- /// </summary>
- public class WmsAreasExportModel
- {
- /// <summary>
- /// WmsArea瀵煎嚭妯″瀷
- /// </summary>
- public class WorkSectionExportModel
- {
- /// <summary>
- /// 鑾峰彇鎴栬缃簱鍖虹紪鍙�
- /// </summary>
- /// <example>WH-AREA-001</example>
- [ExcelColumn(Name = "搴撳尯缂栧彿", Width = 20)]
- public string AreaNo { get; set; }
-
- /// <summary>
- /// 鑾峰彇鎴栬缃簱鍖哄悕绉�
- /// </summary>
- /// <example>鍘熸潗鏂橝鍖�</example>
- [ExcelColumn(Name = "搴撳尯鍚嶇О", Width = 25)]
- public string AreaName { get; set; }
-
- /// <summary>
- /// 鑾峰彇鎴栬缃簱鍖烘弿杩颁俊鎭�
- /// </summary>
- /// <example>瀛樻斁鐢靛瓙鍏冨櫒浠�</example>
- [ExcelColumn(Name = "鎻忚堪", Width = 30)]
- public string AreaDesc { get; set; }
-
- /// <summary>
- /// 鑾峰彇鎴栬缃簱鍖虹姸鎬�
- /// </summary>
- /// <example>Normal</example>
- [ExcelColumn(Name = "搴撳尯鐘舵��", Width = 15)]
- public AreaStatusEnum AreaStatus { get; set; }
-
- /// <summary>
- /// 鑾峰彇鎴栬缃簱鍖虹被鍨�
- /// </summary>
- /// <example>Storage</example>
- [ExcelColumn(Name = "搴撳尯绫诲瀷", Width = 15)]
- public AreaTypeEnum AreaType { get; set; }
-
- /// <summary>
- /// 浠撳簱浠ｇ爜
- /// </summary
- [ExcelColumn(Name = "浠撳簱浠ｇ爜", Width = 15)]
- public string? StoreCode { get; set; }
-
- /// <summary>
- /// 浠撳簱鍚嶇О
- /// </summary>
- [ExcelColumn(Name = "浠撳簱鍚嶇О", Width = 15)]
- public string? StoreName { get; set; }
-
- /// <summary>
- /// 鑾峰彇鎴栬缃鐣欐墿灞曞瓧娈�1
- /// </summary>
- /// <example>鑷畾涔夌敤閫�</example>
- [ExcelColumn(Name = "鎵╁睍瀛楁1", Width = 20)]
- public string RedundantField1 { get; set; }
-
- /// <summary>
- /// 鑾峰彇鎴栬缃鐣欐墿灞曞瓧娈�2
- /// </summary>
- [ExcelColumn(Name = "鎵╁睍瀛楁2", Width = 20)]
- public string RedundantField2 { get; set; }
-
- /// <summary>
- /// 鑾峰彇鎴栬缃鐣欐墿灞曞瓧娈�3
- /// </summary>
- [ExcelColumn(Name = "鎵╁睍瀛楁3", Width = 20)]
- public string RedundantField3 { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [ExcelColumn(Name = "澶囨敞", Width = 25)]
- public virtual string Remark { get; set; }
- }
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsAreas/WmsAreasImportModel.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsAreas/WmsAreasImportModel.cs"
deleted file mode 100644
index ef41a7b..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsAreas/WmsAreasImportModel.cs"
+++ /dev/null
@@ -1,34 +0,0 @@
-using static CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsAreas.WmsAreasExportModel;
-
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsAreas
-{
- /// <summary>
- /// WmsAreas瀵煎叆妯″瀷
- /// </summary>
- public class WmsAreasImportModel
- {
- private List<WmsAreaImportModel> _wmsareas = new();
-
- public List<WmsAreaImportModel> WmsAreas
- {
- get => _wmsareas;
- set
- {
- _wmsareas = value;
- var rowIndex = 2;
- _wmsareas?.ForEach(x => x.RowIndex = rowIndex++);
- }
- }
-
- /// <summary>
- /// WmsArea瀵煎叆妯″瀷
- /// </summary>
- public class WmsAreaImportModel : WorkSectionExportModel
- {
- /// <summary>
- /// 琛屽彿
- /// </summary>
- public int RowIndex { get; set; }
- }
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainers/GetWmsContainersInput.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainers/GetWmsContainersInput.cs"
deleted file mode 100644
index 0380c5e..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainers/GetWmsContainersInput.cs"
+++ /dev/null
@@ -1,35 +0,0 @@
-using CMS.Plugin.HIAWms.Domain.Shared.Enums;
-using Volo.Abp.Application.Dtos;
-
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsContainers;
-
-/// <summary>
-/// WmsContainer鏌ヨ鍙傛暟瀵硅薄
-/// </summary>
-public class GetWmsContainersInput : ExtensiblePagedAndSortedResultRequestDto
-{
- /// <summary>
- /// Gets or sets the filter.
- /// </summary>
- public string Filter { get; set; }
-
- /// <summary>
- /// Gets or sets the name.
- /// </summary>
- public string Name { get; set; }
-
- /// <summary>
- /// 鎵樼洏缂栧彿
- /// </summary>
- public string ContainerNo { get; set; }
-
- /// <summary>
- /// 鎵樼洏绫诲瀷
- /// </summary>
- public ContainerTypeEnum ContainerType { get; set; }
-
- /// <summary>
- /// 鎵樼洏鐘舵��
- /// </summary>
- public ContainerStatusEnum ContainerStatus { get; set; }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainers/WmsContainerCreateDto.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainers/WmsContainerCreateDto.cs"
deleted file mode 100644
index d8e5d03..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainers/WmsContainerCreateDto.cs"
+++ /dev/null
@@ -1,17 +0,0 @@
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsContainers;
-
-/// <summary>
-/// WmsContainer鍒涘缓鍙傛暟瀵硅薄
-/// </summary>
-public class WmsContainerCreateDto : WmsContainerCreateOrUpdateDtoBase
-{
- /// <summary>
- /// 鎺掑簭
- /// </summary>
- public virtual int? Sort { get; set; }
-
- /// <summary>
- /// 鏄惁绂佺敤
- /// </summary>
- public bool? IsDisabled { get; set; } = false;
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainers/WmsContainerCreateOrUpdateDtoBase.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainers/WmsContainerCreateOrUpdateDtoBase.cs"
deleted file mode 100644
index b436229..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainers/WmsContainerCreateOrUpdateDtoBase.cs"
+++ /dev/null
@@ -1,99 +0,0 @@
-using CMS.Plugin.HIAWms.Domain.Shared.Enums;
-using Volo.Abp.Application.Dtos;
-
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsContainers;
-
-/// <summary>
-/// WmsContainer鍒涘缓鎴栨洿鏂板熀绫�
-/// </summary>
-public abstract class WmsContainerCreateOrUpdateDtoBase : ExtensibleEntityDto
-{
-
- /// <summary>
- /// 鎵樼洏缂栧彿
- /// </summary>
- public string ContainerNo { get; set; }
-
- /// <summary>
- /// 鎵樼洏绫诲瀷
- /// </summary>
- public ContainerTypeEnum ContainerType { get; set; }
-
- /// <summary>
- /// 鎵樼洏鐘舵��
- /// </summary>
- public ContainerStatusEnum ContainerStatus { get; set; }
-
- /// <summary>
- /// 闀垮害
- /// </summary>
- public decimal? SpecLength { get; set; }
-
- /// <summary>
- /// 瀹藉害
- /// </summary>
- public decimal? SpecWidth { get; set; }
-
- /// <summary>
- /// 楂樺害
- /// </summary>
- public decimal? SpecHeight { get; set; }
-
- /// <summary>
- /// 闄愰暱
- /// </summary>
- public decimal? LimitLength { get; set; }
-
- /// <summary>
- /// 闄愬
- /// </summary>
- public decimal? LimitWidth { get; set; }
-
- /// <summary>
- /// 闄愰珮
- /// </summary>
- public decimal? LimitHeight { get; set; }
-
- /// <summary>
- /// 杞介噸涓婇檺
- /// </summary>
- public decimal? MaxWeight { get; set; }
-
- /// <summary>
- /// 寮傚父鏁伴噺
- /// </summary>
- public int? ExceptionNumber { get; set; }
-
- /// <summary>
- ///鐗╂枡鏁伴噺
- /// </summary>
- public int? MaterialNumber { get; set; }
-
- /// <summary>
- /// 鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ��
- /// </summary>
- public string RedundantField1 { get; set; }
-
- /// <summary>
- /// 鍐椾綑瀛楁2 - 棰勭暀鎵╁睍鐢ㄩ��
- /// </summary>
- public string RedundantField2 { get; set; }
-
- /// <summary>
- /// 鍐椾綑瀛楁3 - 棰勭暀鎵╁睍鐢ㄩ��
- /// </summary>
- public string RedundantField3 { get; set; }
-
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- public virtual string Remark { get; set; }
-
- /// <summary>
- /// Initializes a new instance of the <see cref="WmsContainerCreateOrUpdateDtoBase"/> class.
- /// </summary>
- public WmsContainerCreateOrUpdateDtoBase() : base(false)
- {
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainers/WmsContainerDto.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainers/WmsContainerDto.cs"
deleted file mode 100644
index 38c5b68..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainers/WmsContainerDto.cs"
+++ /dev/null
@@ -1,145 +0,0 @@
-using CMS.Plugin.HIAWms.Domain.Shared.Enums;
-using Volo.Abp.Application.Dtos;
-using Volo.Abp.Domain.Entities;
-
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsContainers;
-
-/// <summary>
-/// WmsContainer鏁版嵁鍙傛暟瀵硅薄
-/// </summary>
-public class WmsContainerDto : ExtensibleEntityDto<Guid>, IHasConcurrencyStamp
-{
-
- /// <summary>
- /// 鎵樼洏缂栧彿
- /// </summary>
- public string ContainerNo { get; set; }
-
- /// <summary>
- /// 鎵樼洏绫诲瀷
- /// </summary>
- public ContainerTypeEnum ContainerType { get; set; }
-
- /// <summary>
- /// 鎵樼洏绫诲瀷
- /// </summary>
- public string ContainerTypeDesc
- {
- get
- {
- return GetEnumDescriptionUtil.GetEnumDescription(ContainerType);
- }
- }
-
- /// <summary>
- /// 鎵樼洏鐘舵��
- /// </summary>
- public ContainerStatusEnum ContainerStatus { get; set; }
-
- /// <summary>
- /// 鎵樼洏鐘舵��
- /// </summary>
- public string ContainerStatusDesc
- {
- get
- {
- return GetEnumDescriptionUtil.GetEnumDescription(ContainerStatus);
- }
- }
-
- /// <summary>
- /// 闀垮害
- /// </summary>
- public decimal? SpecLength { get; set; }
-
- /// <summary>
- /// 瀹藉害
- /// </summary>
- public decimal? SpecWidth { get; set; }
-
- /// <summary>
- /// 楂樺害
- /// </summary>
- public decimal? SpecHeight { get; set; }
-
- /// <summary>
- /// 闄愰暱
- /// </summary>
- public decimal? LimitLength { get; set; }
-
- /// <summary>
- /// 闄愬
- /// </summary>
- public decimal? LimitWidth { get; set; }
-
- /// <summary>
- /// 闄愰珮
- /// </summary>
- public decimal? LimitHeight { get; set; }
-
- /// <summary>
- /// 杞介噸涓婇檺
- /// </summary>
- public decimal? MaxWeight { get; set; }
-
- /// <summary>
- /// 寮傚父鏁伴噺
- /// </summary>
- public int? ExceptionNumber { get; set; }
-
- /// <summary>
- ///鐗╂枡鏁伴噺
- /// </summary>
- public int? MaterialNumber { get; set; }
-
- /// <summary>
- /// 鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ��
- /// </summary>
- public string RedundantField1 { get; set; }
-
- /// <summary>
- /// 鍐椾綑瀛楁2 - 棰勭暀鎵╁睍鐢ㄩ��
- /// </summary>
- public string RedundantField2 { get; set; }
-
- /// <summary>
- /// 鍐椾綑瀛楁3 - 棰勭暀鎵╁睍鐢ㄩ��
- /// </summary>
- public string RedundantField3 { get; set; }
-
-
- /// <summary>
- /// 鎺掑簭
- /// </summary>
- public virtual int Sort { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- public virtual string Remark { get; set; }
-
- /// <summary>
- /// 鏄惁绂佺敤
- /// </summary>
- public virtual bool? IsDisabled { get; set; }
-
- /// <summary>
- /// 骞跺彂鎴�
- /// </summary>
- public string ConcurrencyStamp { get; set; }
-
- /// <summary>
- /// Gets the export data.
- /// </summary>
- /// <returns></returns>
- public Dictionary<string, object> GetExportData()
- {
- var exportData = new Dictionary<string, object>();
- foreach (var property in this.GetType().GetProperties())
- {
- exportData.Add(property.Name, property.GetValue(this));
- }
-
- return exportData;
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainers/WmsContainerUpdateDto.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainers/WmsContainerUpdateDto.cs"
deleted file mode 100644
index 804744b..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainers/WmsContainerUpdateDto.cs"
+++ /dev/null
@@ -1,14 +0,0 @@
-using Volo.Abp.Domain.Entities;
-
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsContainers;
-
-/// <summary>
-/// WmsContainer鏇存柊鍙傛暟瀵硅薄
-/// </summary>
-public class WmsContainerUpdateDto : WmsContainerCreateOrUpdateDtoBase, IHasConcurrencyStamp
-{
- /// <summary>
- /// 骞跺彂鎴�
- /// </summary>
- public string ConcurrencyStamp { get; set; }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainers/WmsContainersExportModel.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainers/WmsContainersExportModel.cs"
deleted file mode 100644
index f88d958..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainers/WmsContainersExportModel.cs"
+++ /dev/null
@@ -1,113 +0,0 @@
-using CMS.Plugin.HIAWms.Domain.Shared.Enums;
-using MiniExcelLibs.Attributes;
-
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsContainers
-{
- /// <summary>
- /// WmsContainers瀵煎嚭妯″瀷
- /// </summary>
- public class WmsContainersExportModel
- {
- /// <summary>
- /// WmsContainer瀵煎嚭妯″瀷
- /// </summary>
- public class WorkSectionExportModel
- {
- /// <summary>
- /// 鎵樼洏缂栧彿
- /// </summary>
- [ExcelColumn(Name = "鎵樼洏缂栧彿", Width = 25)]
- public string ContainerNo { get; set; }
-
- /// <summary>
- /// 鎵樼洏绫诲瀷
- /// </summary>
- [ExcelColumn(Name = "鎵樼洏绫诲瀷", Width = 25)]
- public ContainerTypeEnum ContainerType { get; set; }
-
- /// <summary>
- /// 鎵樼洏鐘舵��
- /// </summary>
- [ExcelColumn(Name = "鎵樼洏鐘舵��", Width = 25)]
- public ContainerStatusEnum ContainerStatus { get; set; }
-
- /// <summary>
- /// 闀垮害
- /// </summary>
- [ExcelColumn(Name = "闀垮害", Width = 25)]
- public decimal? SpecLength { get; set; }
-
- /// <summary>
- /// 瀹藉害
- /// </summary>
- [ExcelColumn(Name = "瀹藉害", Width = 25)]
- public decimal? SpecWidth { get; set; }
-
- /// <summary>
- /// 楂樺害
- /// </summary>
- [ExcelColumn(Name = "楂樺害", Width = 25)]
- public decimal? SpecHeight { get; set; }
-
- /// <summary>
- /// 闄愰暱
- /// </summary>
- [ExcelColumn(Name = "闄愰暱", Width = 25)]
- public decimal? LimitLength { get; set; }
-
- /// <summary>
- /// 闄愬
- /// </summary>
- [ExcelColumn(Name = "闄愬", Width = 25)]
- public decimal? LimitWidth { get; set; }
-
- /// <summary>
- /// 闄愰珮
- /// </summary>
- [ExcelColumn(Name = "闄愰珮", Width = 25)]
- public decimal? LimitHeight { get; set; }
-
- /// <summary>
- /// 杞介噸涓婇檺
- /// </summary>
- [ExcelColumn(Name = "杞介噸涓婇檺", Width = 25)]
- public decimal? MaxWeight { get; set; }
-
- /// <summary>
- /// 寮傚父鏁伴噺
- /// </summary>
- [ExcelColumn(Name = "寮傚父鏁伴噺", Width = 25)]
- public int? ExceptionNumber { get; set; }
-
- /// <summary>
- /// 鐗╂枡鏁伴噺
- /// </summary>
- [ExcelColumn(Name = "鐗╂枡鏁伴噺", Width = 25)]
- public int? MaterialNumber { get; set; }
-
- /// <summary>
- /// 鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ��
- /// </summary>
- [ExcelColumn(Name = "鍐椾綑瀛楁1", Width = 25)]
- public string RedundantField1 { get; set; }
-
- /// <summary>
- /// 鍐椾綑瀛楁2 - 棰勭暀鎵╁睍鐢ㄩ��
- /// </summary>
- [ExcelColumn(Name = "鍐椾綑瀛楁2", Width = 25)]
- public string RedundantField2 { get; set; }
-
- /// <summary>
- /// 鍐椾綑瀛楁3 - 棰勭暀鎵╁睍鐢ㄩ��
- /// </summary>
- [ExcelColumn(Name = "鍐椾綑瀛楁3", Width = 25)]
- public string RedundantField3 { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [ExcelColumn(Name = "澶囨敞", Width = 25)]
- public virtual string Remark { get; set; }
- }
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainers/WmsContainersImportModel.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainers/WmsContainersImportModel.cs"
deleted file mode 100644
index 5f1cdc0..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainers/WmsContainersImportModel.cs"
+++ /dev/null
@@ -1,34 +0,0 @@
-using static CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsContainers.WmsContainersExportModel;
-
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsContainers
-{
- /// <summary>
- /// WmsContainers瀵煎叆妯″瀷
- /// </summary>
- public class WmsContainersImportModel
- {
- private List<WmsContainerImportModel> _wmscontainers = new();
-
- public List<WmsContainerImportModel> WmsContainers
- {
- get => _wmscontainers;
- set
- {
- _wmscontainers = value;
- var rowIndex = 2;
- _wmscontainers?.ForEach(x => x.RowIndex = rowIndex++);
- }
- }
-
- /// <summary>
- /// WmsContainer瀵煎叆妯″瀷
- /// </summary>
- public class WmsContainerImportModel : WorkSectionExportModel
- {
- /// <summary>
- /// 琛屽彿
- /// </summary>
- public int RowIndex { get; set; }
- }
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsEnumDto/WmsEnumInput.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsEnumDto/WmsEnumInput.cs"
deleted file mode 100644
index 2cc0375..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsEnumDto/WmsEnumInput.cs"
+++ /dev/null
@@ -1,21 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsEnumDto
-{
- /// <summary>
- /// 鏋氫妇杈撳叆鍙傛暟
- /// </summary>
- public class WmsEnumInput
- {
- /// <summary>
- /// 鏋氫妇绫诲瀷鍚嶇О
- /// </summary>
- /// <example>AccountTypeEnum</example>
- public string EnumName { get; set; }
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockRecord/GetWmsInOutStockRecordInput.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockRecord/GetWmsInOutStockRecordInput.cs"
deleted file mode 100644
index 7a6f32f..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockRecord/GetWmsInOutStockRecordInput.cs"
+++ /dev/null
@@ -1,249 +0,0 @@
-using CmsQueryExtensions.Extension;
-using Volo.Abp.Application.Dtos;
-
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsInOutStockRecord;
-
-/// <summary>
-/// 鍑哄叆搴撹褰曡〃鏌ヨ鍙傛暟
-/// </summary>
-public class GetWmsInOutStockRecordInput : ExtensiblePagedAndSortedResultRequestDto
-{
-
- #region 鍏抽敭瀛楁煡璇�
-
- /// <summary>
- /// 鍏抽敭瀛楁ā绯婃煡璇紙娉ㄦ剰鏄皬鍐欙紒锛�
- /// </summary>
- public string searchVal { get; set; }
-
- /// <summary>
- /// 閫氱敤鏌ヨ閰嶇疆 (1:妯＄硦鏌ヨ , 2:绮惧噯鏌ヨ)锛堟敞鎰忔槸灏忓啓锛侊級
- /// </summary>
- public SearchFilterModeEnum searchVal_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
-
- /// <summary>
- /// 瀛愭悳绱㈢粍浠朵紶閫掔殑閫氱敤鏌ヨ閰嶇疆鐨勫睘鎬у悕锛堟敞鎰忔槸灏忓啓锛侊級
- /// </summary>
- [NoAutoQuery]
- public string str_searchFormInputAttrs { get; set; }
- /// <summary>
- /// 瀛愭悳绱㈢粍浠朵紶閫掔殑閫氱敤鏌ヨ閰嶇疆鐨勫睘鎬у悕锛堟敞鎰忔槸灏忓啓锛侊級
- /// </summary>
- public List<string> searchFormInputAttrs
- {
- get
- {
- if (!string.IsNullOrEmpty(str_searchFormInputAttrs))
- {
- return str_searchFormInputAttrs.Split(',').ToList();
- }
- return new List<string>();
- }
- }
-
- #endregion
-
- /// <summary>
- /// 鍗曟嵁缂栧彿
- /// </summary>
- public string OrderNo { get; set; }
-
- /// <summary>
- /// 鍗曟嵁缂栧彿-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum OrderNo_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
-
- /// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
- public string MaterialName { get; set; }
-
- /// <summary>
- /// 鐗╂枡鍚嶇О-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum MaterialName_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
-
- /// <summary>
- /// 鐗╂枡浠跺彿
- /// </summary>
- public string MaterialNo { get; set; }
-
- /// <summary>
- /// 鐗╂枡浠跺彿-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum MaterialNo_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
-
- /// <summary>
- /// 鎿嶄綔绫诲瀷
- /// </summary>
- public int? StockType { get; set; }
-
- /// <summary>
- /// 鎿嶄綔绫诲瀷-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum StockType_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
-
- /// <summary>
- /// 瀹瑰櫒缂栧彿
- /// </summary>
- public string ContainerNo { get; set; }
-
- /// <summary>
- /// 瀹瑰櫒缂栧彿-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum ContainerNo_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
-
- /// <summary>
- /// 鏈哄瀷
- /// </summary>
- public string MaterialModel { get; set; }
-
- /// <summary>
- /// 鏈哄瀷-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum MaterialModel_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
-
- /// <summary>
- /// 鎿嶄綔鏃堕棿
- /// </summary>
- //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
- [HighSearchRangeAttribute]
- public List<string> OperateTime { get; set; }
-
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- public string Remark { get; set; }
-
- /// <summary>
- /// 澶囨敞-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum Remark_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
-
- /// <summary>
- /// 鐗╂枡ID
- /// </summary>
- public string MaterialId { get; set; }
-
- /// <summary>
- /// 鐗╂枡ID-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum MaterialId_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
-
- /// <summary>
- /// 浠诲姟鍙�
- /// </summary>
- public string TaskNo { get; set; }
-
- /// <summary>
- /// 浠诲姟鍙�-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum TaskNo_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
-
- /// <summary>
- /// 璧峰搴撲綅
- /// </summary>
- public string SourcePlace { get; set; }
-
- /// <summary>
- /// 璧峰搴撲綅-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum SourcePlace_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
-
- /// <summary>
- /// 鐩爣搴撲綅
- /// </summary>
- public string ToPlace { get; set; }
-
- /// <summary>
- /// 鐩爣搴撲綅-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum ToPlace_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
-
- /// <summary>
- ///
- /// </summary>
- //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
- [HighSearchRangeAttribute]
- public List<string> CreationTime { get; set; }
-
-
- /// <summary>
- ///
- /// </summary>
- public string CreatorId { get; set; }
-
- /// <summary>
- /// -鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum CreatorId_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
-
- /// <summary>
- ///
- /// </summary>
- //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
- [HighSearchRangeAttribute]
- public List<string> LastModificationTime { get; set; }
-
-
- /// <summary>
- ///
- /// </summary>
- public string LastModifierId { get; set; }
-
- /// <summary>
- /// -鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum LastModifierId_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
-
- /// <summary>
- ///
- /// </summary>
- public bool? IsDeleted { get; set; }
-
- /// <summary>
- /// -鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum IsDeleted_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
-
- /// <summary>
- ///
- /// </summary>
- public string DeleterId { get; set; }
-
- /// <summary>
- /// -鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum DeleterId_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
-
- /// <summary>
- ///
- /// </summary>
- //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
- [HighSearchRangeAttribute]
- public List<string> DeletionTime { get; set; }
-
-
- /// <summary>
- /// 鏄惁绂佺敤
- /// </summary>
- public bool? IsDisabled { get; set; }
-
- /// <summary>
- /// 鏄惁绂佺敤-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum IsDisabled_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
-
- /// <summary>
- /// 鎺掑簭
- /// </summary>
- public int? Sort { get; set; }
-
- /// <summary>
- /// 鎺掑簭-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum Sort_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
-
-
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockRecord/WmsInOutStockRecordCreateDto.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockRecord/WmsInOutStockRecordCreateDto.cs"
deleted file mode 100644
index 3df2845..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockRecord/WmsInOutStockRecordCreateDto.cs"
+++ /dev/null
@@ -1,17 +0,0 @@
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsInOutStockRecord;
-
-/// <summary>
-/// 鍑哄叆搴撹褰曡〃鍒涘缓鍙傛暟瀵硅薄
-/// </summary>
-public class WmsInOutStockRecordCreateDto : WmsInOutStockRecordCreateOrUpdateDtoBase
-{
- /// <summary>
- /// 鎺掑簭
- /// </summary>
- public virtual int? Sort { get; set; }
-
- /// <summary>
- /// 鏄惁绂佺敤
- /// </summary>
- public bool? IsDisabled { get; set; } = false;
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockRecord/WmsInOutStockRecordCreateOrUpdateDtoBase.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockRecord/WmsInOutStockRecordCreateOrUpdateDtoBase.cs"
deleted file mode 100644
index a110416..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockRecord/WmsInOutStockRecordCreateOrUpdateDtoBase.cs"
+++ /dev/null
@@ -1,100 +0,0 @@
-using CMS.Plugin.HIAWms.Domain.Shared.Enums;
-using System;
-using Volo.Abp.Application.Dtos;
-
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsInOutStockRecord;
-
-/// <summary>
-/// 鍑哄叆搴撹褰曡〃鍒涘缓鎴栨洿鏂板熀绫�
-/// </summary>
-public abstract class WmsInOutStockRecordCreateOrUpdateDtoBase : ExtensibleEntityDto
-{
- /// <summary>
- /// 鍗曟嵁缂栧彿
- /// </summary>
- public string OrderNo { get; set; }
-
- /// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
- public string? MaterialName { get; set; }
-
- /// <summary>
- /// 鐗╂枡浠跺彿
- /// </summary>
- public string MaterialNo { get; set; }
-
- /// <summary>
- /// 鎿嶄綔绫诲瀷
- /// </summary>
- public StockTypeEnum StockType { get; set; }
-
- /// <summary>
- /// 瀹瑰櫒缂栧彿
- /// </summary>
- public string? ContainerNo { get; set; }
-
- /// <summary>
- /// 鏈哄瀷
- /// </summary>
- public string? MaterialModel { get; set; }
-
- /// <summary>
- /// 鎿嶄綔鏃堕棿
- /// </summary>
- public DateTime? OperateTime { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- public string? Remark { get; set; }
-
- /// <summary>
- /// 鐗╂枡ID
- /// </summary>
- public string MaterialId { get; set; }
-
- /// <summary>
- /// 浠诲姟鍙�
- /// </summary>
- public string TaskNo { get; set; }
-
- /// <summary>
- /// 璧峰搴撲綅
- /// </summary>
- public string? SourcePlace { get; set; }
-
- /// <summary>
- /// 鐩爣搴撲綅
- /// </summary>
- public string? ToPlace { get; set; }
-
- /// <summary>
- ///
- /// </summary>
- public string? CreatorId { get; set; }
-
- /// <summary>
- ///
- /// </summary>
- public string? LastModifierId { get; set; }
-
- /// <summary>
- /// 鏄惁绂佺敤
- /// </summary>
- public bool? IsDisabled { get; set; }
-
- /// <summary>
- /// 鎺掑簭
- /// </summary>
- public int Sort { get; set; }
-
-
-
- /// <summary>
- /// Initializes a new instance of the <see cref="WmsInOutStockRecordCreateOrUpdateDtoBase"/> class.
- /// </summary>
- public WmsInOutStockRecordCreateOrUpdateDtoBase() : base(false)
- {
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockRecord/WmsInOutStockRecordDto.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockRecord/WmsInOutStockRecordDto.cs"
deleted file mode 100644
index 5612122..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockRecord/WmsInOutStockRecordDto.cs"
+++ /dev/null
@@ -1,155 +0,0 @@
-using CMS.Plugin.HIAWms.Domain.Shared.Enums;
-using Volo.Abp.Application.Dtos;
-using Volo.Abp.Data;
-using Volo.Abp.Domain.Entities;
-
-
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsInOutStockRecord;
-
-/// <summary>
-/// 鍑哄叆搴撹褰曡〃鏁版嵁鍙傛暟瀵硅薄
-/// </summary>
-public class WmsInOutStockRecordDto: ExtensibleEntityDto<Guid>, IHasConcurrencyStamp
-{
- /// <summary>
- /// 鍗曟嵁缂栧彿
- /// </summary>
- public string OrderNo { get; set; }
-
- /// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
- public string? MaterialName { get; set; }
-
- /// <summary>
- /// 鐗╂枡浠跺彿
- /// </summary>
- public string MaterialNo { get; set; }
-
- /// <summary>
- /// 鎿嶄綔绫诲瀷
- /// </summary>
- public StockTypeEnum StockType { get; set; }
-
- /// <summary>
- /// 鎿嶄綔绫诲瀷
- /// </summary>
- public string StockTypeDesc
- {
- get
- {
- return GetEnumDescriptionUtil.GetEnumDescription(StockType);
- }
- }
- /// <summary>
- /// 瀹瑰櫒缂栧彿
- /// </summary>
- public string? ContainerNo { get; set; }
-
- /// <summary>
- /// 鏈哄瀷
- /// </summary>
- public string? MaterialModel { get; set; }
-
- /// <summary>
- /// 鎿嶄綔鏃堕棿
- /// </summary>
- public DateTime? OperateTime { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- public string? Remark { get; set; }
-
- /// <summary>
- /// 鐗╂枡ID
- /// </summary>
- public string MaterialId { get; set; }
-
- /// <summary>
- /// 浠诲姟鍙�
- /// </summary>
- public string TaskNo { get; set; }
-
- /// <summary>
- /// 璧峰搴撲綅
- /// </summary>
- public string? SourcePlace { get; set; }
-
- /// <summary>
- /// 鐩爣搴撲綅
- /// </summary>
- public string? ToPlace { get; set; }
-
- /// <summary>
- ///
- /// </summary>
- public ExtraPropertyDictionary? ExtraProperties { get; set; }
-
- /// <summary>
- ///
- /// </summary>
- public string? ConcurrencyStamp { get; set; }
-
- /// <summary>
- ///
- /// </summary>
- public DateTime CreationTime { get; set; }
-
- /// <summary>
- ///
- /// </summary>
- public string? CreatorId { get; set; }
-
- /// <summary>
- ///
- /// </summary>
- public DateTime? LastModificationTime { get; set; }
-
- /// <summary>
- ///
- /// </summary>
- public string? LastModifierId { get; set; }
-
- /// <summary>
- ///
- /// </summary>
- public bool IsDeleted { get; set; }
-
- /// <summary>
- ///
- /// </summary>
- public string? DeleterId { get; set; }
-
- /// <summary>
- ///
- /// </summary>
- public DateTime? DeletionTime { get; set; }
-
- /// <summary>
- /// 鏄惁绂佺敤
- /// </summary>
- public bool? IsDisabled { get; set; }
-
- /// <summary>
- /// 鎺掑簭
- /// </summary>
- public int Sort { get; set; }
-
-
-
- /// <summary>
- /// Gets the export data.
- /// </summary>
- /// <returns></returns>
- public Dictionary<string, object> GetExportData()
- {
- var exportData = new Dictionary<string, object>();
- foreach (var property in this.GetType().GetProperties())
- {
- exportData.Add(property.Name, property.GetValue(this));
- }
-
- return exportData;
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockRecord/WmsInOutStockRecordExportModel.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockRecord/WmsInOutStockRecordExportModel.cs"
deleted file mode 100644
index 8f86f61..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockRecord/WmsInOutStockRecordExportModel.cs"
+++ /dev/null
@@ -1,109 +0,0 @@
-using MiniExcelLibs.Attributes;
-using System.ComponentModel.DataAnnotations;
-using System;
-using System.ComponentModel;
-using CMS.Plugin.HIAWms.Domain.Shared.Enums;
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsInOutStockRecord;
-
-/// <summary>
-/// 鍑哄叆搴撹褰曡〃瀵煎嚭妯″瀷
-/// </summary>
-public class WmsInOutStockRecordExportModel
-{
- /// <summary>
- /// 鍗曟嵁缂栧彿
- /// </summary>
- [ExcelColumn(Name = "鍗曟嵁缂栧彿", Width = 25)]
- public string OrderNo { get; set; }
-
- /// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
- [ExcelColumn(Name = "鐗╂枡鍚嶇О", Width = 25)]
- public string MaterialName { get; set; }
-
- /// <summary>
- /// 鐗╂枡浠跺彿
- /// </summary>
- [ExcelColumn(Name = "鐗╂枡浠跺彿", Width = 25)]
- public string MaterialNo { get; set; }
-
- /// <summary>
- /// 鎿嶄綔绫诲瀷
- /// </summary>
- [ExcelColumn(Name = "鎿嶄綔绫诲瀷", Width = 25)]
- public StockTypeEnum StockType { get; set; }
-
- /// <summary>
- /// 瀹瑰櫒缂栧彿
- /// </summary>
- [ExcelColumn(Name = "瀹瑰櫒缂栧彿", Width = 25)]
- public string ContainerNo { get; set; }
-
- /// <summary>
- /// 鏈哄瀷
- /// </summary>
- [ExcelColumn(Name = "鏈哄瀷", Width = 25)]
- public string MaterialModel { get; set; }
-
- /// <summary>
- /// 鎿嶄綔鏃堕棿
- /// </summary>
- [ExcelColumn(Name = "鎿嶄綔鏃堕棿", Width = 25)]
- public DateTime OperateTime { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [ExcelColumn(Name = "澶囨敞", Width = 25)]
- public string Remark { get; set; }
-
- /// <summary>
- /// 鐗╂枡ID
- /// </summary>
- [ExcelColumn(Name = "鐗╂枡ID", Width = 25)]
- public string MaterialId { get; set; }
-
- /// <summary>
- /// 浠诲姟鍙�
- /// </summary>
- [ExcelColumn(Name = "浠诲姟鍙�", Width = 25)]
- public string TaskNo { get; set; }
-
- /// <summary>
- /// 璧峰搴撲綅
- /// </summary>
- [ExcelColumn(Name = "璧峰搴撲綅", Width = 25)]
- public string SourcePlace { get; set; }
-
- /// <summary>
- /// 鐩爣搴撲綅
- /// </summary>
- [ExcelColumn(Name = "鐩爣搴撲綅", Width = 25)]
- public string ToPlace { get; set; }
-
- /// <summary>
- /// 鏄惁绂佺敤
- /// </summary>
- [ExcelColumn(Name = "鏄惁绂佺敤", Width = 25)]
- public bool? IsDisabled { get; set; }
-
- /// <summary>
- /// 鎺掑簭
- /// </summary>
- [ExcelColumn(Name = "鎺掑簭", Width = 25)]
- public int Sort { get; set; }
-
-
-
- public Dictionary<string, object> GetExportData()
- {
- var exportData = new Dictionary<string, object>();
- foreach (var property in this.GetType().GetProperties())
- {
- exportData.Add(property.Name, property.GetValue(this));
- }
-
- return exportData;
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockRecord/WmsInOutStockRecordUpdateDto.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockRecord/WmsInOutStockRecordUpdateDto.cs"
deleted file mode 100644
index 7a04030..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockRecord/WmsInOutStockRecordUpdateDto.cs"
+++ /dev/null
@@ -1,13 +0,0 @@
-using Volo.Abp.Domain.Entities;
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsInOutStockRecord;
-
-/// <summary>
-/// 鍑哄叆搴撹褰曡〃鏇存柊鍙傛暟瀵硅薄
-/// </summary>
-public class WmsInOutStockRecordUpdateDto : WmsInOutStockRecordCreateOrUpdateDtoBase, IHasConcurrencyStamp
-{
- /// <summary>
- /// 骞跺彂鎴�
- /// </summary>
- public string ConcurrencyStamp { get; set; }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockRecord/WmsInOutStockRecordsImportModel.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockRecord/WmsInOutStockRecordsImportModel.cs"
deleted file mode 100644
index 7e3e4ce..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockRecord/WmsInOutStockRecordsImportModel.cs"
+++ /dev/null
@@ -1,33 +0,0 @@
-
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsInOutStockRecord
-{
- /// <summary>
- /// 鍑哄叆搴撹褰曡〃瀵煎叆妯″瀷
- /// </summary>
- public class WmsInOutStockRecordsImportModel
- {
- private List<WmsInOutStockRecordImportModel> _WmsInOutStockRecords = new();
-
- public List<WmsInOutStockRecordImportModel> WmsInOutStockRecords
- {
- get => _WmsInOutStockRecords;
- set
- {
- _WmsInOutStockRecords = value;
- var rowIndex = 2;
- _WmsInOutStockRecords?.ForEach(x => x.RowIndex = rowIndex++);
- }
- }
-
- /// <summary>
- /// 鍑哄叆搴撹褰曡〃瀵煎叆妯″瀷
- /// </summary>
- public class WmsInOutStockRecordImportModel : WmsInOutStockRecordExportModel
- {
- /// <summary>
- /// 琛屽彿
- /// </summary>
- public int RowIndex { get; set; }
- }
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/GetWmsMaterialInput.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/GetWmsMaterialInput.cs"
deleted file mode 100644
index b097042..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/GetWmsMaterialInput.cs"
+++ /dev/null
@@ -1,301 +0,0 @@
-using CmsQueryExtensions.Extension;
-using Volo.Abp.Application.Dtos;
-
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterial;
-
-/// <summary>
-/// 鐗╂枡鍩虹淇℃伅琛ㄦ煡璇㈠弬鏁�
-/// </summary>
-public class GetWmsMaterialInput : ExtensiblePagedAndSortedResultRequestDto
-{
-
- #region 鍏抽敭瀛楁煡璇�
-
- /// <summary>
- /// 鍏抽敭瀛楁ā绯婃煡璇紙娉ㄦ剰鏄皬鍐欙紒锛�
- /// </summary>
- public string searchVal { get; set; }
-
- /// <summary>
- /// 閫氱敤鏌ヨ閰嶇疆 (1:妯＄硦鏌ヨ , 2:绮惧噯鏌ヨ)锛堟敞鎰忔槸灏忓啓锛侊級
- /// </summary>
- public SearchFilterModeEnum searchVal_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
-
- /// <summary>
- /// 瀛愭悳绱㈢粍浠朵紶閫掔殑閫氱敤鏌ヨ閰嶇疆鐨勫睘鎬у悕锛堟敞鎰忔槸灏忓啓锛侊級
- /// </summary>
- [NoAutoQuery]
- public string str_searchFormInputAttrs { get; set; }
- /// <summary>
- /// 瀛愭悳绱㈢粍浠朵紶閫掔殑閫氱敤鏌ヨ閰嶇疆鐨勫睘鎬у悕锛堟敞鎰忔槸灏忓啓锛侊級
- /// </summary>
- public List<string> searchFormInputAttrs
- {
- get
- {
- if (!string.IsNullOrEmpty(str_searchFormInputAttrs))
- {
- return str_searchFormInputAttrs.Split(',').ToList();
- }
- return new List<string>();
- }
- }
-
- #endregion
-
- /// <summary>
- /// 鐗╂枡缂栫爜锛堝敮涓�鏍囪瘑锛�
- /// </summary>
- public string MaterialCode { get; set; }
-
- /// <summary>
- /// 鐗╂枡缂栫爜锛堝敮涓�鏍囪瘑锛�-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum MaterialCode_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
-
- /// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
- public string MaterialName { get; set; }
-
- /// <summary>
- /// 鐗╂枡鍚嶇О-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum MaterialName_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
-
- /// <summary>
- /// 閲囪喘绫诲瀷锛堟灇涓惧�硷級
- /// </summary>
- public int? PurchaseType { get; set; }
-
- /// <summary>
- /// 閲囪喘绫诲瀷锛堟灇涓惧�硷級-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum PurchaseType_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
-
- /// <summary>
- /// 鐗╂枡绫诲瀷锛堟灇涓惧�硷級
- /// </summary>
- public int? MaterialType { get; set; }
-
- /// <summary>
- /// 鐗╂枡绫诲瀷锛堟灇涓惧�硷級-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum MaterialType_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
-
- /// <summary>
- /// 涓诲崟浣嶏紙濡傦細kg銆乵銆佷釜锛�
- /// </summary>
- public string PrimaryUnit { get; set; }
-
- /// <summary>
- /// 涓诲崟浣嶏紙濡傦細kg銆乵銆佷釜锛�-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum PrimaryUnit_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
-
- /// <summary>
- /// 瑙勬牸/鏍囧噯锛堝锛欸B/T 8163-2018锛�
- /// </summary>
- public string Standard { get; set; }
-
- /// <summary>
- /// 瑙勬牸/鏍囧噯锛堝锛欸B/T 8163-2018锛�-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum Standard_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
-
- /// <summary>
- /// 澶栧緞锛堝崟浣嶏細mm锛�
- /// </summary>
- public decimal? OuterDiameter { get; set; }
-
- /// <summary>
- /// 澶栧緞锛堝崟浣嶏細mm锛�-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum OuterDiameter_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
-
- /// <summary>
- /// 澹佸帤锛堝崟浣嶏細mm锛�
- /// </summary>
- public decimal? WallThickness { get; set; }
-
- /// <summary>
- /// 澹佸帤锛堝崟浣嶏細mm锛�-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum WallThickness_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
-
- /// <summary>
- /// 鏉愯川锛堝锛�304涓嶉攬閽級
- /// </summary>
- public string MaterialQuality { get; set; }
-
- /// <summary>
- /// 鏉愯川锛堝锛�304涓嶉攬閽級-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum MaterialQuality_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
-
- /// <summary>
- /// 闀垮害锛堝崟浣嶏細m锛�
- /// </summary>
- public decimal? Length { get; set; }
-
- /// <summary>
- /// 闀垮害锛堝崟浣嶏細m锛�-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum Length_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
-
- /// <summary>
- /// 鏄惁涓轰富鏀
- /// </summary>
- public int? IsMainBranch { get; set; }
-
- /// <summary>
- /// 鏄惁涓轰富鏀-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum IsMainBranch_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
-
- /// <summary>
- /// 鐢熶骇宸ュ巶
- /// </summary>
- public string Factory { get; set; }
-
- /// <summary>
- /// 鐢熶骇宸ュ巶-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum Factory_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
-
- /// <summary>
- /// 璇佷功缂栧彿
- /// </summary>
- public string Certification { get; set; }
-
- /// <summary>
- /// 璇佷功缂栧彿-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum Certification_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
-
- /// <summary>
- /// 鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ��
- /// </summary>
- public string RedundantField1 { get; set; }
-
- /// <summary>
- /// 鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ��-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum RedundantField1_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
-
- /// <summary>
- /// 鍐椾綑瀛楁2 - 棰勭暀鎵╁睍鐢ㄩ��
- /// </summary>
- public string RedundantField2 { get; set; }
-
- /// <summary>
- /// 鍐椾綑瀛楁2 - 棰勭暀鎵╁睍鐢ㄩ��-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum RedundantField2_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
-
- /// <summary>
- /// 鍐椾綑瀛楁3 - 棰勭暀鎵╁睍鐢ㄩ��
- /// </summary>
- public string RedundantField3 { get; set; }
-
- /// <summary>
- /// 鍐椾綑瀛楁3 - 棰勭暀鎵╁睍鐢ㄩ��-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum RedundantField3_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
-
- /// <summary>
- /// 鎺掑簭
- /// </summary>
- public int? Sort { get; set; }
-
- /// <summary>
- /// 鎺掑簭-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum Sort_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- public string Remark { get; set; }
-
- /// <summary>
- /// 澶囨敞-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum Remark_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
-
- /// <summary>
- /// 鏄惁绂佺敤
- /// </summary>
- public bool? IsDisabled { get; set; }
-
- /// <summary>
- /// 鏄惁绂佺敤-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum IsDisabled_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
-
- /// <summary>
- ///
- /// </summary>
- //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
- [HighSearchRangeAttribute]
- public List<string> CreationTime { get; set; }
-
-
- /// <summary>
- ///
- /// </summary>
- public string CreatorId { get; set; }
-
- /// <summary>
- /// -鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum CreatorId_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
-
- /// <summary>
- ///
- /// </summary>
- //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
- [HighSearchRangeAttribute]
- public List<string> LastModificationTime { get; set; }
-
-
- /// <summary>
- ///
- /// </summary>
- public string LastModifierId { get; set; }
-
- /// <summary>
- /// -鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum LastModifierId_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
-
- /// <summary>
- ///
- /// </summary>
- public bool? IsDeleted { get; set; }
-
- /// <summary>
- /// -鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum IsDeleted_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
-
- /// <summary>
- ///
- /// </summary>
- public string DeleterId { get; set; }
-
- /// <summary>
- /// -鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum DeleterId_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
-
- /// <summary>
- ///
- /// </summary>
- //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
- [HighSearchRangeAttribute]
- public List<string> DeletionTime { get; set; }
-
-
-
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialCreateDto.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialCreateDto.cs"
deleted file mode 100644
index 4d06a47..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialCreateDto.cs"
+++ /dev/null
@@ -1,17 +0,0 @@
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterial;
-
-/// <summary>
-/// 鐗╂枡鍩虹淇℃伅琛ㄥ垱寤哄弬鏁板璞�
-/// </summary>
-public class WmsMaterialCreateDto : WmsMaterialCreateOrUpdateDtoBase
-{
- /// <summary>
- /// 鎺掑簭
- /// </summary>
- public virtual int? Sort { get; set; }
-
- /// <summary>
- /// 鏄惁绂佺敤
- /// </summary>
- public bool? IsDisabled { get; set; } = false;
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialCreateOrUpdateDtoBase.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialCreateOrUpdateDtoBase.cs"
deleted file mode 100644
index 136291a..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialCreateOrUpdateDtoBase.cs"
+++ /dev/null
@@ -1,124 +0,0 @@
-using CMS.Plugin.HIAWms.Domain.Shared.Enums;
-using Volo.Abp.Application.Dtos;
-
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterial;
-
-/// <summary>
-/// 鐗╂枡鍩虹淇℃伅琛ㄥ垱寤烘垨鏇存柊鍩虹被
-/// </summary>
-public abstract class WmsMaterialCreateOrUpdateDtoBase : ExtensibleEntityDto
-{
- /// <summary>
- /// 鐗╂枡缂栫爜锛堝敮涓�鏍囪瘑锛�
- /// </summary>
- public string MaterialCode { get; set; }
-
- /// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
- public string MaterialName { get; set; }
-
- /// <summary>
- /// 閲囪喘绫诲瀷锛堟灇涓惧�硷級
- /// </summary>
- public PurchaseTypeEnum PurchaseType { get; set; }
-
- /// <summary>
- /// 鐗╂枡绫诲瀷锛堟灇涓惧�硷級
- /// </summary>
- public MaterialTypeEnum MaterialType { get; set; }
-
- /// <summary>
- /// 涓诲崟浣嶏紙濡傦細kg銆乵銆佷釜锛�
- /// </summary>
- public string? PrimaryUnit { get; set; }
-
- /// <summary>
- /// 瑙勬牸/鏍囧噯锛堝锛欸B/T 8163-2018锛�
- /// </summary>
- public string? Standard { get; set; }
-
- /// <summary>
- /// 澶栧緞锛堝崟浣嶏細mm锛�
- /// </summary>
- public decimal OuterDiameter { get; set; }
-
- /// <summary>
- /// 澹佸帤锛堝崟浣嶏細mm锛�
- /// </summary>
- public decimal WallThickness { get; set; }
-
- /// <summary>
- /// 鏉愯川锛堝锛�304涓嶉攬閽級
- /// </summary>
- public string? MaterialQuality { get; set; }
-
- /// <summary>
- /// 闀垮害锛堝崟浣嶏細m锛�
- /// </summary>
- public decimal Length { get; set; }
-
- /// <summary>
- /// 鏄惁涓轰富鏀
- /// </summary>
- public YesNoEnum IsMainBranch { get; set; }
-
- /// <summary>
- /// 鐢熶骇宸ュ巶
- /// </summary>
- public string? Factory { get; set; }
-
- /// <summary>
- /// 璇佷功缂栧彿
- /// </summary>
- public string? Certification { get; set; }
-
- /// <summary>
- /// 鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ��
- /// </summary>
- public string? RedundantField1 { get; set; }
-
- /// <summary>
- /// 鍐椾綑瀛楁2 - 棰勭暀鎵╁睍鐢ㄩ��
- /// </summary>
- public string? RedundantField2 { get; set; }
-
- /// <summary>
- /// 鍐椾綑瀛楁3 - 棰勭暀鎵╁睍鐢ㄩ��
- /// </summary>
- public string? RedundantField3 { get; set; }
-
- /// <summary>
- /// 鎺掑簭
- /// </summary>
- public int Sort { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- public string? Remark { get; set; }
-
- /// <summary>
- /// 鏄惁绂佺敤
- /// </summary>
- public bool? IsDisabled { get; set; }
-
- /// <summary>
- ///
- /// </summary>
- public string? CreatorId { get; set; }
-
- /// <summary>
- ///
- /// </summary>
- public string? LastModifierId { get; set; }
-
-
-
- /// <summary>
- /// Initializes a new instance of the <see cref="WmsMaterialCreateOrUpdateDtoBase"/> class.
- /// </summary>
- public WmsMaterialCreateOrUpdateDtoBase() : base(false)
- {
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialDto.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialDto.cs"
deleted file mode 100644
index f67f983..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialDto.cs"
+++ /dev/null
@@ -1,200 +0,0 @@
-using CMS.Plugin.HIAWms.Domain.Shared.Enums;
-using Volo.Abp.Application.Dtos;
-using Volo.Abp.Data;
-using Volo.Abp.Domain.Entities;
-
-
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterial;
-
-/// <summary>
-/// 鐗╂枡鍩虹淇℃伅琛ㄦ暟鎹弬鏁板璞�
-/// </summary>
-public class WmsMaterialDto: ExtensibleEntityDto<Guid>, IHasConcurrencyStamp
-{
- /// <summary>
- /// 鐗╂枡缂栫爜锛堝敮涓�鏍囪瘑锛�
- /// </summary>
- public string MaterialCode { get; set; }
-
- /// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
- public string MaterialName { get; set; }
-
- /// <summary>
- /// 閲囪喘绫诲瀷锛堟灇涓惧�硷級
- /// </summary>
- public PurchaseTypeEnum PurchaseType { get; set; }
-
- /// <summary>
- /// 閲囪喘绫诲瀷锛堟灇涓惧�硷級
- /// </summary>
- public string PurchaseTypeDesc
- {
- get
- {
- return GetEnumDescriptionUtil.GetEnumDescription(PurchaseType);
- }
- }
- /// <summary>
- /// 鐗╂枡绫诲瀷锛堟灇涓惧�硷級
- /// </summary>
- public MaterialTypeEnum MaterialType { get; set; }
-
- /// <summary>
- /// 鐗╂枡绫诲瀷锛堟灇涓惧�硷級
- /// </summary>
- public string MaterialTypeDesc
- {
- get
- {
- return GetEnumDescriptionUtil.GetEnumDescription(MaterialType);
- }
- }
- /// <summary>
- /// 涓诲崟浣嶏紙濡傦細kg銆乵銆佷釜锛�
- /// </summary>
- public string? PrimaryUnit { get; set; }
-
- /// <summary>
- /// 瑙勬牸/鏍囧噯锛堝锛欸B/T 8163-2018锛�
- /// </summary>
- public string? Standard { get; set; }
-
- /// <summary>
- /// 澶栧緞锛堝崟浣嶏細mm锛�
- /// </summary>
- public decimal OuterDiameter { get; set; }
-
- /// <summary>
- /// 澹佸帤锛堝崟浣嶏細mm锛�
- /// </summary>
- public decimal WallThickness { get; set; }
-
- /// <summary>
- /// 鏉愯川锛堝锛�304涓嶉攬閽級
- /// </summary>
- public string? MaterialQuality { get; set; }
-
- /// <summary>
- /// 闀垮害锛堝崟浣嶏細m锛�
- /// </summary>
- public decimal Length { get; set; }
-
- /// <summary>
- /// 鏄惁涓轰富鏀
- /// </summary>
- public YesNoEnum IsMainBranch { get; set; }
-
- /// <summary>
- /// 鏄惁涓轰富鏀
- /// </summary>
- public string IsMainBranchDesc
- {
- get
- {
- return GetEnumDescriptionUtil.GetEnumDescription(IsMainBranch);
- }
- }
- /// <summary>
- /// 鐢熶骇宸ュ巶
- /// </summary>
- public string? Factory { get; set; }
-
- /// <summary>
- /// 璇佷功缂栧彿
- /// </summary>
- public string? Certification { get; set; }
-
- /// <summary>
- /// 鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ��
- /// </summary>
- public string? RedundantField1 { get; set; }
-
- /// <summary>
- /// 鍐椾綑瀛楁2 - 棰勭暀鎵╁睍鐢ㄩ��
- /// </summary>
- public string? RedundantField2 { get; set; }
-
- /// <summary>
- /// 鍐椾綑瀛楁3 - 棰勭暀鎵╁睍鐢ㄩ��
- /// </summary>
- public string? RedundantField3 { get; set; }
-
- /// <summary>
- /// 鎺掑簭
- /// </summary>
- public int Sort { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- public string? Remark { get; set; }
-
- /// <summary>
- /// 鏄惁绂佺敤
- /// </summary>
- public bool? IsDisabled { get; set; }
-
- /// <summary>
- ///
- /// </summary>
- public ExtraPropertyDictionary? ExtraProperties { get; set; }
-
- /// <summary>
- ///
- /// </summary>
- public string? ConcurrencyStamp { get; set; }
-
- /// <summary>
- ///
- /// </summary>
- public DateTime CreationTime { get; set; }
-
- /// <summary>
- ///
- /// </summary>
- public string? CreatorId { get; set; }
-
- /// <summary>
- ///
- /// </summary>
- public DateTime? LastModificationTime { get; set; }
-
- /// <summary>
- ///
- /// </summary>
- public string? LastModifierId { get; set; }
-
- /// <summary>
- ///
- /// </summary>
- public bool IsDeleted { get; set; }
-
- /// <summary>
- ///
- /// </summary>
- public string? DeleterId { get; set; }
-
- /// <summary>
- ///
- /// </summary>
- public DateTime? DeletionTime { get; set; }
-
-
-
- /// <summary>
- /// Gets the export data.
- /// </summary>
- /// <returns></returns>
- public Dictionary<string, object> GetExportData()
- {
- var exportData = new Dictionary<string, object>();
- foreach (var property in this.GetType().GetProperties())
- {
- exportData.Add(property.Name, property.GetValue(this));
- }
-
- return exportData;
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialExportModel.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialExportModel.cs"
deleted file mode 100644
index c75b208..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialExportModel.cs"
+++ /dev/null
@@ -1,138 +0,0 @@
-using MiniExcelLibs.Attributes;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel;
-using CMS.Plugin.HIAWms.Domain.Shared.Enums;
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterial;
-
-/// <summary>
-/// 鐗╂枡鍩虹淇℃伅琛ㄥ鍑烘ā鍨�
-/// </summary>
-public class WmsMaterialExportModel
-{
- /// <summary>
- /// 鐗╂枡缂栫爜锛堝敮涓�鏍囪瘑锛�
- /// </summary>
- [ExcelColumn(Name = "鐗╂枡缂栫爜锛堝敮涓�鏍囪瘑锛�", Width = 25)]
- public string MaterialCode { get; set; }
-
- /// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
- [ExcelColumn(Name = "鐗╂枡鍚嶇О", Width = 25)]
- public string MaterialName { get; set; }
-
- /// <summary>
- /// 閲囪喘绫诲瀷锛堟灇涓惧�硷級
- /// </summary>
- [ExcelColumn(Name = "閲囪喘绫诲瀷锛堟灇涓惧�硷級", Width = 25)]
- public PurchaseTypeEnum PurchaseType { get; set; }
-
- /// <summary>
- /// 鐗╂枡绫诲瀷锛堟灇涓惧�硷級
- /// </summary>
- [ExcelColumn(Name = "鐗╂枡绫诲瀷锛堟灇涓惧�硷級", Width = 25)]
- public MaterialTypeEnum MaterialType { get; set; }
-
- /// <summary>
- /// 涓诲崟浣嶏紙濡傦細kg銆乵銆佷釜锛�
- /// </summary>
- [ExcelColumn(Name = "涓诲崟浣嶏紙濡傦細kg銆乵銆佷釜锛�", Width = 25)]
- public string PrimaryUnit { get; set; }
-
- /// <summary>
- /// 瑙勬牸/鏍囧噯锛堝锛欸B/T 8163-2018锛�
- /// </summary>
- [ExcelColumn(Name = "瑙勬牸/鏍囧噯锛堝锛欸B/T 8163-2018锛�", Width = 25)]
- public string Standard { get; set; }
-
- /// <summary>
- /// 澶栧緞锛堝崟浣嶏細mm锛�
- /// </summary>
- [ExcelColumn(Name = "澶栧緞锛堝崟浣嶏細mm锛�", Width = 25)]
- public decimal OuterDiameter { get; set; }
-
- /// <summary>
- /// 澹佸帤锛堝崟浣嶏細mm锛�
- /// </summary>
- [ExcelColumn(Name = "澹佸帤锛堝崟浣嶏細mm锛�", Width = 25)]
- public decimal WallThickness { get; set; }
-
- /// <summary>
- /// 鏉愯川锛堝锛�304涓嶉攬閽級
- /// </summary>
- [ExcelColumn(Name = "鏉愯川锛堝锛�304涓嶉攬閽級", Width = 25)]
- public string MaterialQuality { get; set; }
-
- /// <summary>
- /// 闀垮害锛堝崟浣嶏細m锛�
- /// </summary>
- [ExcelColumn(Name = "闀垮害锛堝崟浣嶏細m锛�", Width = 25)]
- public decimal Length { get; set; }
-
- /// <summary>
- /// 鏄惁涓轰富鏀
- /// </summary>
- [ExcelColumn(Name = "鏄惁涓轰富鏀", Width = 25)]
- public YesNoEnum IsMainBranch { get; set; }
-
- /// <summary>
- /// 鐢熶骇宸ュ巶
- /// </summary>
- [ExcelColumn(Name = "鐢熶骇宸ュ巶", Width = 25)]
- public string Factory { get; set; }
-
- /// <summary>
- /// 璇佷功缂栧彿
- /// </summary>
- [ExcelColumn(Name = "璇佷功缂栧彿", Width = 25)]
- public string Certification { get; set; }
-
- /// <summary>
- /// 鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ��
- /// </summary>
- [ExcelColumn(Name = "鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ��", Width = 25)]
- public string RedundantField1 { get; set; }
-
- /// <summary>
- /// 鍐椾綑瀛楁2 - 棰勭暀鎵╁睍鐢ㄩ��
- /// </summary>
- [ExcelColumn(Name = "鍐椾綑瀛楁2 - 棰勭暀鎵╁睍鐢ㄩ��", Width = 25)]
- public string RedundantField2 { get; set; }
-
- /// <summary>
- /// 鍐椾綑瀛楁3 - 棰勭暀鎵╁睍鐢ㄩ��
- /// </summary>
- [ExcelColumn(Name = "鍐椾綑瀛楁3 - 棰勭暀鎵╁睍鐢ㄩ��", Width = 25)]
- public string RedundantField3 { get; set; }
-
- /// <summary>
- /// 鎺掑簭
- /// </summary>
- [ExcelColumn(Name = "鎺掑簭", Width = 25)]
- public int Sort { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [ExcelColumn(Name = "澶囨敞", Width = 25)]
- public string Remark { get; set; }
-
- /// <summary>
- /// 鏄惁绂佺敤
- /// </summary>
- [ExcelColumn(Name = "鏄惁绂佺敤", Width = 25)]
- public bool? IsDisabled { get; set; }
-
-
-
- public Dictionary<string, object> GetExportData()
- {
- var exportData = new Dictionary<string, object>();
- foreach (var property in this.GetType().GetProperties())
- {
- exportData.Add(property.Name, property.GetValue(this));
- }
-
- return exportData;
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialUpdateDto.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialUpdateDto.cs"
deleted file mode 100644
index 51d9818..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialUpdateDto.cs"
+++ /dev/null
@@ -1,13 +0,0 @@
-using Volo.Abp.Domain.Entities;
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterial;
-
-/// <summary>
-/// 鐗╂枡鍩虹淇℃伅琛ㄦ洿鏂板弬鏁板璞�
-/// </summary>
-public class WmsMaterialUpdateDto : WmsMaterialCreateOrUpdateDtoBase, IHasConcurrencyStamp
-{
- /// <summary>
- /// 骞跺彂鎴�
- /// </summary>
- public string ConcurrencyStamp { get; set; }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialsImportModel.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialsImportModel.cs"
deleted file mode 100644
index 798a29b..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialsImportModel.cs"
+++ /dev/null
@@ -1,33 +0,0 @@
-
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterial
-{
- /// <summary>
- /// 鐗╂枡鍩虹淇℃伅琛ㄥ鍏ユā鍨�
- /// </summary>
- public class WmsMaterialsImportModel
- {
- private List<WmsMaterialImportModel> _WmsMaterials = new();
-
- public List<WmsMaterialImportModel> WmsMaterials
- {
- get => _WmsMaterials;
- set
- {
- _WmsMaterials = value;
- var rowIndex = 2;
- _WmsMaterials?.ForEach(x => x.RowIndex = rowIndex++);
- }
- }
-
- /// <summary>
- /// 鐗╂枡鍩虹淇℃伅琛ㄥ鍏ユā鍨�
- /// </summary>
- public class WmsMaterialImportModel : WmsMaterialExportModel
- {
- /// <summary>
- /// 琛屽彿
- /// </summary>
- public int RowIndex { get; set; }
- }
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/GetWmsPlacesInput.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/GetWmsPlacesInput.cs"
deleted file mode 100644
index 20ae282..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/GetWmsPlacesInput.cs"
+++ /dev/null
@@ -1,19 +0,0 @@
-using Volo.Abp.Application.Dtos;
-
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlaces;
-
-/// <summary>
-/// WmsPlace鏌ヨ鍙傛暟瀵硅薄
-/// </summary>
-public class GetWmsPlacesInput : ExtensiblePagedAndSortedResultRequestDto
-{
- /// <summary>
- /// Gets or sets the filter.
- /// </summary>
- public string Filter { get; set; }
-
- /// <summary>
- /// Gets or sets the name.
- /// </summary>
- public string Name { get; set; }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/WmsPlaceCreateDto.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/WmsPlaceCreateDto.cs"
deleted file mode 100644
index 8730f57..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/WmsPlaceCreateDto.cs"
+++ /dev/null
@@ -1,17 +0,0 @@
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlaces;
-
-/// <summary>
-/// WmsPlace鍒涘缓鍙傛暟瀵硅薄
-/// </summary>
-public class WmsPlaceCreateDto : WmsPlaceCreateOrUpdateDtoBase
-{
- /// <summary>
- /// 鎺掑簭
- /// </summary>
- public virtual int? Sort { get; set; }
-
- /// <summary>
- /// 鏄惁绂佺敤
- /// </summary>
- public bool? IsDisabled { get; set; } = false;
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/WmsPlaceCreateOrUpdateDtoBase.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/WmsPlaceCreateOrUpdateDtoBase.cs"
deleted file mode 100644
index e63a577..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/WmsPlaceCreateOrUpdateDtoBase.cs"
+++ /dev/null
@@ -1,87 +0,0 @@
-using CMS.Plugin.HIAWms.Domain.Shared.Enums;
-using Volo.Abp.Application.Dtos;
-
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlaces;
-
-/// <summary>
-/// WmsPlace鍒涘缓鎴栨洿鏂板熀绫�
-/// </summary>
-public abstract class WmsPlaceCreateOrUpdateDtoBase : ExtensibleEntityDto
-{
- /// <summary>
- /// 缂栧彿
- /// </summary>
- public virtual string PlaceNo { get; set; }
-
- /// <summary>
- /// 璐т綅绫诲瀷
- /// </summary>
- public PlaceTypeEnum StorageTypeNo { get; set; }
-
- /// <summary>
- /// 璐т綅鐘舵��
- /// </summary>
- public PlaceStatusEnum PlaceStatus { get; set; }
-
- /// <summary>
- /// 鎵�鍦ㄥ簱鍖�
- /// </summary>
- public string AreaCode { get; set; }
-
- /// <summary>
- /// 宸烽亾
- /// </summary>
- public int Aisle { get; set; }
-
- /// <summary>
- /// 鎺�
- /// </summary>
- public int RowNo { get; set; }
-
- /// <summary>
- /// 鍒�
- /// </summary>
- public int ColumnNo { get; set; }
-
- /// <summary>
- /// 灞�
- /// </summary>
- public int LayerNo { get; set; }
-
- /// <summary>
- /// 鏄惁閿佸畾
- /// </summary>
- public YesNoEnum Islock { get; set; }
-
- /// <summary>
- /// 鏄惁绌烘墭
- /// </summary>
- public YesNoEnum EmptyContainer { get; set; }
-
- /// <summary>
- /// 鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ��
- /// </summary>
- public string RedundantField1 { get; set; }
-
- /// <summary>
- /// 鍐椾綑瀛楁2 - 棰勭暀鎵╁睍鐢ㄩ��
- /// </summary>
- public string RedundantField2 { get; set; }
-
- /// <summary>
- /// 鍐椾綑瀛楁3 - 棰勭暀鎵╁睍鐢ㄩ��
- /// </summary>
- public string RedundantField3 { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- public virtual string Remark { get; set; }
-
- /// <summary>
- /// Initializes a new instance of the <see cref="WmsPlaceCreateOrUpdateDtoBase"/> class.
- /// </summary>
- public WmsPlaceCreateOrUpdateDtoBase() : base(false)
- {
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/WmsPlaceDto.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/WmsPlaceDto.cs"
deleted file mode 100644
index c4e2357..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/WmsPlaceDto.cs"
+++ /dev/null
@@ -1,155 +0,0 @@
-using CMS.Plugin.HIAWms.Domain.Shared.Enums;
-using Volo.Abp.Application.Dtos;
-using Volo.Abp.Domain.Entities;
-
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlaces;
-
-/// <summary>
-/// WmsPlace鏁版嵁鍙傛暟瀵硅薄
-/// </summary>
-public class WmsPlaceDto : ExtensibleEntityDto<Guid>, IHasConcurrencyStamp
-{
- /// <summary>
- /// 缂栧彿
- /// </summary>
- public virtual string PlaceNo { get; protected set; }
-
- /// <summary>
- /// 璐т綅绫诲瀷
- /// </summary>
- public PlaceTypeEnum StorageTypeNo { get; protected set; }
-
- /// <summary>
- /// 璐т綅绫诲瀷
- /// </summary>
- public string StorageTypeNoDesc
- {
- get
- {
- return GetEnumDescriptionUtil.GetEnumDescription(StorageTypeNo);
- }
- }
-
- /// <summary>
- /// 璐т綅鐘舵��
- /// </summary>
- public PlaceStatusEnum PlaceStatus { get; protected set; }
-
- /// <summary>
- /// 璐т綅鐘舵��
- /// </summary>
- public string PlaceStatusDesc
- {
- get
- {
- return GetEnumDescriptionUtil.GetEnumDescription(PlaceStatus);
- }
- }
-
- /// <summary>
- /// 鎵�鍦ㄥ簱鍖�
- /// </summary>
- public string AreaCode { get; protected set; }
-
- /// <summary>
- /// 宸烽亾
- /// </summary>
- public int Aisle { get; protected set; }
-
- /// <summary>
- /// 鎺�
- /// </summary>
- public int RowNo { get; protected set; }
-
- /// <summary>
- /// 鍒�
- /// </summary>
- public int ColumnNo { get; protected set; }
-
- /// <summary>
- /// 灞�
- /// </summary>
- public int LayerNo { get; protected set; }
-
- /// <summary>
- /// 鏄惁閿佸畾
- /// </summary>
- public YesNoEnum Islock { get; protected set; }
-
- /// <summary>
- /// 鏄惁閿佸畾
- /// </summary>
- public string IslockDesc
- {
- get
- {
- return GetEnumDescriptionUtil.GetEnumDescription(Islock);
- }
- }
-
- /// <summary>
- /// 鏄惁绌烘墭
- /// </summary>
- public YesNoEnum EmptyContainer { get; protected set; }
-
- /// <summary>
- /// 鏄惁绌烘墭
- /// </summary>
- public string EmptyContainerDesc
- {
- get
- {
- return GetEnumDescriptionUtil.GetEnumDescription(EmptyContainer);
- }
- }
-
- /// <summary>
- /// 鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ��
- /// </summary>
- public string RedundantField1 { get; set; }
-
- /// <summary>
- /// 鍐椾綑瀛楁2 - 棰勭暀鎵╁睍鐢ㄩ��
- /// </summary>
- public string RedundantField2 { get; set; }
-
- /// <summary>
- /// 鍐椾綑瀛楁3 - 棰勭暀鎵╁睍鐢ㄩ��
- /// </summary>
- public string RedundantField3 { get; set; }
-
- /// <summary>
- /// 鎺掑簭
- /// </summary>
- public virtual int Sort { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- public virtual string Remark { get; set; }
-
- /// <summary>
- /// 鏄惁绂佺敤
- /// </summary>
- public virtual bool? IsDisabled { get; set; }
-
- /// <summary>
- /// 骞跺彂鎴�
- /// </summary>
- public string ConcurrencyStamp { get; set; }
-
- /// <summary>
- /// Gets the export data.
- /// </summary>
- /// <returns></returns>
- public Dictionary<string, object> GetExportData()
- {
- var exportData = new Dictionary<string, object>();
- foreach (var property in this.GetType().GetProperties())
- {
- exportData.Add(property.Name, property.GetValue(this));
- }
-
- return exportData;
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/WmsPlaceUpdateDto.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/WmsPlaceUpdateDto.cs"
deleted file mode 100644
index 31432f2..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/WmsPlaceUpdateDto.cs"
+++ /dev/null
@@ -1,14 +0,0 @@
-using Volo.Abp.Domain.Entities;
-
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlaces;
-
-/// <summary>
-/// WmsPlace鏇存柊鍙傛暟瀵硅薄
-/// </summary>
-public class WmsPlaceUpdateDto : WmsPlaceCreateOrUpdateDtoBase, IHasConcurrencyStamp
-{
- /// <summary>
- /// 骞跺彂鎴�
- /// </summary>
- public string ConcurrencyStamp { get; set; }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/WmsPlacesExportModel.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/WmsPlacesExportModel.cs"
deleted file mode 100644
index c4a8975..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/WmsPlacesExportModel.cs"
+++ /dev/null
@@ -1,111 +0,0 @@
-using CMS.Plugin.HIAWms.Domain.Shared.Enums;
-using MiniExcelLibs.Attributes;
-
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlaces
-{
- /// <summary>
- /// WmsPlaces瀵煎嚭妯″瀷
- /// </summary>
- public class WmsPlacesExportModel
- {
- /// <summary>
- /// WmsPlace瀵煎嚭妯″瀷
- /// </summary>
- public class WorkSectionExportModel
- {
- /// <summary>
- /// 鑾峰彇鎴栬缃揣浣嶇紪鍙�
- /// </summary>
- /// <example>PL-001-01-01</example>
- [ExcelColumn(Name = "璐т綅缂栧彿", Width = 20)]
- public string PlaceNo { get; set; }
-
- /// <summary>
- /// 鑾峰彇鎴栬缃揣浣嶇被鍨�
- /// </summary>
- /// <example>Normal</example>
- [ExcelColumn(Name = "璐т綅绫诲瀷", Width = 15)]
- public PlaceTypeEnum StorageTypeNo { get; set; }
-
- /// <summary>
- /// 鑾峰彇鎴栬缃揣浣嶇姸鎬�
- /// </summary>
- /// <example>Available</example>
- [ExcelColumn(Name = "璐т綅鐘舵��", Width = 15)]
- public PlaceStatusEnum PlaceStatus { get; set; }
-
- /// <summary>
- /// 鑾峰彇鎴栬缃墍鍦ㄥ簱鍖虹紪鍙�
- /// </summary>
- /// <example>AREA-001</example>
- [ExcelColumn(Name = "鎵�灞炲簱鍖�", Width = 20)]
- public string AreaCode { get; set; }
-
- /// <summary>
- /// 鑾峰彇鎴栬缃贩閬撶紪鍙�
- /// </summary>
- /// <example>1</example>
- [ExcelColumn(Name = "宸烽亾", Width = 10)]
- public int Aisle { get; set; }
-
- /// <summary>
- /// 鑾峰彇鎴栬缃帓鍙�
- /// </summary>
- /// <example>2</example>
- [ExcelColumn(Name = "鎺�", Width = 10)]
- public int RowNo { get; set; }
-
- /// <summary>
- /// 鑾峰彇鎴栬缃垪鍙�
- /// </summary>
- /// <example>3</example>
- [ExcelColumn(Name = "鍒�", Width = 10)]
- public int ColumnNo { get; set; }
-
- /// <summary>
- /// 鑾峰彇鎴栬缃眰鍙�
- /// </summary>
- /// <example>1</example>
- [ExcelColumn(Name = "灞�", Width = 10)]
- public int LayerNo { get; set; }
-
- /// <summary>
- /// 鑾峰彇鎴栬缃攣瀹氱姸鎬�
- /// </summary>
- /// <example>No</example>
- [ExcelColumn(Name = "鏄惁閿佸畾", Width = 12)]
- public YesNoEnum Islock { get; set; }
-
- /// <summary>
- /// 鑾峰彇鎴栬缃┖鎵樼姸鎬�
- /// </summary>
- /// <example>Yes</example>
- [ExcelColumn(Name = "鏄惁绌烘墭", Width = 12)]
- public YesNoEnum EmptyContainer { get; set; }
-
- /// <summary>
- /// 鑾峰彇鎴栬缃鐣欐墿灞曞瓧娈�1
- /// </summary>
- [ExcelColumn(Name = "鎵╁睍瀛楁1", Width = 20)]
- public string RedundantField1 { get; set; }
-
- /// <summary>
- /// 鑾峰彇鎴栬缃鐣欐墿灞曞瓧娈�2
- /// </summary>
- [ExcelColumn(Name = "鎵╁睍瀛楁2", Width = 20)]
- public string RedundantField2 { get; set; }
-
- /// <summary>
- /// 鑾峰彇鎴栬缃鐣欐墿灞曞瓧娈�3
- /// </summary>
- [ExcelColumn(Name = "鎵╁睍瀛楁3", Width = 20)]
- public string RedundantField3 { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [ExcelColumn(Name = "澶囨敞", Width = 25)]
- public virtual string Remark { get; set; }
- }
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/WmsPlacesImportModel.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/WmsPlacesImportModel.cs"
deleted file mode 100644
index d6c86eb..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/WmsPlacesImportModel.cs"
+++ /dev/null
@@ -1,34 +0,0 @@
-using static CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlaces.WmsPlacesExportModel;
-
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlaces
-{
- /// <summary>
- /// WmsPlaces瀵煎叆妯″瀷
- /// </summary>
- public class WmsPlacesImportModel
- {
- private List<WmsPlaceImportModel> _wmsplaces = new();
-
- public List<WmsPlaceImportModel> WmsPlaces
- {
- get => _wmsplaces;
- set
- {
- _wmsplaces = value;
- var rowIndex = 2;
- _wmsplaces?.ForEach(x => x.RowIndex = rowIndex++);
- }
- }
-
- /// <summary>
- /// WmsPlace瀵煎叆妯″瀷
- /// </summary>
- public class WmsPlaceImportModel : WorkSectionExportModel
- {
- /// <summary>
- /// 琛屽彿
- /// </summary>
- public int RowIndex { get; set; }
- }
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStores/GetWmsStoresInput.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStores/GetWmsStoresInput.cs"
deleted file mode 100644
index 0d3d180..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStores/GetWmsStoresInput.cs"
+++ /dev/null
@@ -1,29 +0,0 @@
-using Volo.Abp.Application.Dtos;
-
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStores;
-
-/// <summary>
-/// WmsStore鏌ヨ鍙傛暟瀵硅薄
-/// </summary>
-public class GetWmsStoresInput : ExtensiblePagedAndSortedResultRequestDto
-{
- /// <summary>
- /// Gets or sets the filter.
- /// </summary>
- public string Filter { get; set; }
-
- /// <summary>
- /// Gets or sets the name.
- /// </summary>
- public string Name { get; set; }
-
- /// <summary>
- /// 浠撳簱浠ｇ爜
- /// </summary>
- public string? StoreCode { get; set; }
-
- /// <summary>
- /// 浠撳簱鍚嶇О
- /// </summary>
- public string? StoreName { get; set; }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStores/WmsStoreCreateDto.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStores/WmsStoreCreateDto.cs"
deleted file mode 100644
index bfb8a5d..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStores/WmsStoreCreateDto.cs"
+++ /dev/null
@@ -1,17 +0,0 @@
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStores;
-
-/// <summary>
-/// WmsStore鍒涘缓鍙傛暟瀵硅薄
-/// </summary>
-public class WmsStoreCreateDto : WmsStoreCreateOrUpdateDtoBase
-{
- /// <summary>
- /// 鎺掑簭
- /// </summary>
- public virtual int? Sort { get; set; }
-
- /// <summary>
- /// 鏄惁绂佺敤
- /// </summary>
- public bool? IsDisabled { get; set; } = false;
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStores/WmsStoreCreateOrUpdateDtoBase.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStores/WmsStoreCreateOrUpdateDtoBase.cs"
deleted file mode 100644
index 216bb01..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStores/WmsStoreCreateOrUpdateDtoBase.cs"
+++ /dev/null
@@ -1,46 +0,0 @@
-using Volo.Abp.Application.Dtos;
-
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStores;
-
-/// <summary>
-/// WmsStore鍒涘缓鎴栨洿鏂板熀绫�
-/// </summary>
-public abstract class WmsStoreCreateOrUpdateDtoBase : ExtensibleEntityDto
-{
- /// <summary>
- /// 浠撳簱浠ｇ爜
- /// </summary>
- public string? StoreCode { get; set; }
-
- /// <summary>
- /// 浠撳簱鍚嶇О
- /// </summary>
- public string? StoreName { get; set; }
-
- /// <summary>
- /// 鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ��
- /// </summary>
- public string RedundantField1 { get; set; }
-
- /// <summary>
- /// 鍐椾綑瀛楁2 - 棰勭暀鎵╁睍鐢ㄩ��
- /// </summary>
- public string RedundantField2 { get; set; }
-
- /// <summary>
- /// 鍐椾綑瀛楁3 - 棰勭暀鎵╁睍鐢ㄩ��
- /// </summary>
- public string RedundantField3 { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- public virtual string Remark { get; set; }
-
- /// <summary>
- /// Initializes a new instance of the <see cref="WmsStoreCreateOrUpdateDtoBase"/> class.
- /// </summary>
- public WmsStoreCreateOrUpdateDtoBase() : base(false)
- {
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStores/WmsStoreDto.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStores/WmsStoreDto.cs"
deleted file mode 100644
index 314626d..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStores/WmsStoreDto.cs"
+++ /dev/null
@@ -1,87 +0,0 @@
-using Volo.Abp.Application.Dtos;
-using Volo.Abp.Domain.Entities;
-
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStores;
-
-/// <summary>
-/// WmsStore鏁版嵁鍙傛暟瀵硅薄
-/// </summary>
-public class WmsStoreDto : ExtensibleEntityDto<Guid>, IHasConcurrencyStamp
-{
- /// <summary>
- /// 浠撳簱浠ｇ爜
- /// </summary>
- public string? StoreCode { get; set; }
-
- /// <summary>
- /// 浠撳簱鍚嶇О
- /// </summary>
- public string? StoreName { get; set; }
-
- /// <summary>
- /// 鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ��
- /// </summary>
- public string RedundantField1 { get; set; }
-
- /// <summary>
- /// 鍐椾綑瀛楁2 - 棰勭暀鎵╁睍鐢ㄩ��
- /// </summary>
- public string RedundantField2 { get; set; }
-
- /// <summary>
- /// 鍐椾綑瀛楁3 - 棰勭暀鎵╁睍鐢ㄩ��
- /// </summary>
- public string RedundantField3 { get; set; }
-
- /// <summary>
- /// 鎺掑簭
- /// </summary>
- public virtual int Sort { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- public virtual string Remark { get; set; }
-
- /// <summary>
- /// 鏄惁绂佺敤
- /// </summary>
- public virtual bool? IsDisabled { get; set; }
-
- /// <summary>
- /// 骞跺彂鎴�
- /// </summary>
- public string ConcurrencyStamp { get; set; }
-
- /// <summary>
- /// Gets the export data.
- /// </summary>
- /// <returns></returns>
- public Dictionary<string, object> GetExportData()
- {
- var exportData = new Dictionary<string, object>();
- foreach (var property in this.GetType().GetProperties())
- {
- exportData.Add(property.Name, property.GetValue(this));
- }
-
- return exportData;
- }
-}
-
-
-/// <summary>
-/// 鍋氫粨搴撻�夋嫨浣跨敤
-/// </summary>
-public class WmsStoreForAreaOutpur
-{
- /// <summary>
- /// 浠撳簱浠ｇ爜
- /// </summary>
- public string? StoreCode { get; set; }
-
- /// <summary>
- /// 浠撳簱鍚嶇О
- /// </summary>
- public string? StoreName { get; set; }
-}
\ No newline at end of file
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStores/WmsStoreUpdateDto.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStores/WmsStoreUpdateDto.cs"
deleted file mode 100644
index f679a99..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStores/WmsStoreUpdateDto.cs"
+++ /dev/null
@@ -1,14 +0,0 @@
-using Volo.Abp.Domain.Entities;
-
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStores;
-
-/// <summary>
-/// WmsStore鏇存柊鍙傛暟瀵硅薄
-/// </summary>
-public class WmsStoreUpdateDto : WmsStoreCreateOrUpdateDtoBase, IHasConcurrencyStamp
-{
- /// <summary>
- /// 骞跺彂鎴�
- /// </summary>
- public string ConcurrencyStamp { get; set; }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStores/WmsStoresExportModel.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStores/WmsStoresExportModel.cs"
deleted file mode 100644
index fac0db6..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStores/WmsStoresExportModel.cs"
+++ /dev/null
@@ -1,54 +0,0 @@
-using MiniExcelLibs.Attributes;
-
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStores
-{
- /// <summary>
- /// WmsStores瀵煎嚭妯″瀷
- /// </summary>
- public class WmsStoresExportModel
- {
- /// <summary>
- /// WmsStore瀵煎嚭妯″瀷
- /// </summary>
- public class WorkSectionExportModel
- {
- /// <summary>
- /// 鑾峰彇鎴栬缃粨搴撲唬鐮�
- /// </summary>
- /// <example>WH-001</example>
- [ExcelColumn(Name = "浠撳簱浠ｇ爜", Width = 20)]
- public string StoreCode { get; set; }
-
- /// <summary>
- /// 鑾峰彇鎴栬缃粨搴撳悕绉�
- /// </summary>
- /// <example>涓婃捣涓績浠�</example>
- [ExcelColumn(Name = "浠撳簱鍚嶇О", Width = 25)]
- public string StoreName { get; set; }
-
- /// <summary>
- /// 鑾峰彇鎴栬缃鐣欐墿灞曞瓧娈�1
- /// </summary>
- [ExcelColumn(Name = "鎵╁睍瀛楁1", Width = 20)]
- public string RedundantField1 { get; set; }
-
- /// <summary>
- /// 鑾峰彇鎴栬缃鐣欐墿灞曞瓧娈�2
- /// </summary>
- [ExcelColumn(Name = "鎵╁睍瀛楁2", Width = 20)]
- public string RedundantField2 { get; set; }
-
- /// <summary>
- /// 鑾峰彇鎴栬缃鐣欐墿灞曞瓧娈�3
- /// </summary>
- [ExcelColumn(Name = "鎵╁睍瀛楁3", Width = 20)]
- public string RedundantField3 { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [ExcelColumn(Name = "澶囨敞", Width = 25)]
- public virtual string Remark { get; set; }
- }
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStores/WmsStoresImportModel.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStores/WmsStoresImportModel.cs"
deleted file mode 100644
index 42194fa..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStores/WmsStoresImportModel.cs"
+++ /dev/null
@@ -1,34 +0,0 @@
-using static CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStores.WmsStoresExportModel;
-
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStores
-{
- /// <summary>
- /// WmsStores瀵煎叆妯″瀷
- /// </summary>
- public class WmsStoresImportModel
- {
- private List<WmsStoreImportModel> _wmsstores = new();
-
- public List<WmsStoreImportModel> WmsStores
- {
- get => _wmsstores;
- set
- {
- _wmsstores = value;
- var rowIndex = 2;
- _wmsstores?.ForEach(x => x.RowIndex = rowIndex++);
- }
- }
-
- /// <summary>
- /// WmsStore瀵煎叆妯″瀷
- /// </summary>
- public class WmsStoreImportModel : WorkSectionExportModel
- {
- /// <summary>
- /// 琛屽彿
- /// </summary>
- public int RowIndex { get; set; }
- }
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/ICMSPluginQueryAppService.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/ICMSPluginQueryAppService.cs"
deleted file mode 100644
index b971dc3..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/ICMSPluginQueryAppService.cs"
+++ /dev/null
@@ -1,10 +0,0 @@
-using Volo.Abp.Application.Services;
-
-namespace CMS.Plugin.HIAWms.Application.Contracts;
-
-/// <summary>
-/// 鏌ヨ搴旂敤鏈嶅姟
-/// </summary>
-public interface ICMSPluginQueryAppService : IApplicationService
-{
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsAreaAppService.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsAreaAppService.cs"
deleted file mode 100644
index 08aff0f..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsAreaAppService.cs"
+++ /dev/null
@@ -1,46 +0,0 @@
-using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsAreas;
-using Volo.Abp.Application.Services;
-
-namespace CMS.Plugin.HIAWms.Application.Contracts.Services;
-
-/// <summary>
-/// WmsArea搴旂敤鏈嶅姟
-/// </summary>
-public interface IWmsAreaAppService : ICrudAppService<WmsAreaDto, Guid, GetWmsAreasInput, WmsAreaCreateDto, WmsAreaUpdateDto>
-{
- /// <summary>
- /// Clones the asynchronous.
- /// </summary>
- /// <param name="ids">The ids.</param>
- /// <returns></returns>
- Task<List<WmsAreaDto>> CloneAsync(IEnumerable<Guid> ids);
-
- /// <summary>
- /// Deletes the many asynchronous.
- /// </summary>
- /// <param name="ids">The ids.</param>
- /// <returns></returns>
- Task DeleteManyAsync(IEnumerable<Guid> ids);
-
- /// <summary>
- /// Adjusts the sort asynchronous.
- /// </summary>
- /// <param name="id">The identifier.</param>
- /// <param name="sort">The sort.</param>
- /// <returns></returns>
- Task AdjustSortAsync(Guid id, int sort);
-
- /// <summary>
- /// Imports the asynchronous.
- /// </summary>
- /// <param name="input">The input.</param>
- /// <returns></returns>
- Task ImportAsync(WmsAreasImportModel input);
-
- /// <summary>
- /// Exports the asynchronous.
- /// </summary>
- /// <param name="input">The input.</param>
- /// <returns></returns>
- Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsAreasInput input);
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsContainerAppService.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsContainerAppService.cs"
deleted file mode 100644
index d529fe2..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsContainerAppService.cs"
+++ /dev/null
@@ -1,46 +0,0 @@
-using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsContainers;
-using Volo.Abp.Application.Services;
-
-namespace CMS.Plugin.HIAWms.Application.Contracts.Services;
-
-/// <summary>
-/// WmsContainer搴旂敤鏈嶅姟
-/// </summary>
-public interface IWmsContainerAppService : ICrudAppService<WmsContainerDto, Guid, GetWmsContainersInput, WmsContainerCreateDto, WmsContainerUpdateDto>
-{
- /// <summary>
- /// Clones the asynchronous.
- /// </summary>
- /// <param name="ids">The ids.</param>
- /// <returns></returns>
- Task<List<WmsContainerDto>> CloneAsync(IEnumerable<Guid> ids);
-
- /// <summary>
- /// Deletes the many asynchronous.
- /// </summary>
- /// <param name="ids">The ids.</param>
- /// <returns></returns>
- Task DeleteManyAsync(IEnumerable<Guid> ids);
-
- /// <summary>
- /// Adjusts the sort asynchronous.
- /// </summary>
- /// <param name="id">The identifier.</param>
- /// <param name="sort">The sort.</param>
- /// <returns></returns>
- Task AdjustSortAsync(Guid id, int sort);
-
- /// <summary>
- /// Imports the asynchronous.
- /// </summary>
- /// <param name="input">The input.</param>
- /// <returns></returns>
- Task ImportAsync(WmsContainersImportModel input);
-
- /// <summary>
- /// Exports the asynchronous.
- /// </summary>
- /// <param name="input">The input.</param>
- /// <returns></returns>
- Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsContainersInput input);
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsEnumAppService.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsEnumAppService.cs"
deleted file mode 100644
index 7e6899f..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsEnumAppService.cs"
+++ /dev/null
@@ -1,36 +0,0 @@
-锘縰sing CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsEnumDto;
-using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStores;
-using CMS.Plugin.HIAWms.Domain.Shared.Util;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using static CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsAreas.WmsAreaCreateOrUpdateDtoBase;
-
-namespace CMS.Plugin.HIAWms.Application.Contracts.Services
-{
- /// <summary>
- /// 鏋氫妇鎺ュ彛
- /// </summary>
- public interface IWmsEnumAppService
- {
- /// <summary>
- /// 鑾峰彇鏋氫妇.
- /// </summary>
- /// <returns></returns>
- List<EnumItem> GetEnumDataList(WmsEnumInput enumInput);
-
- /// <summary>
- /// 鑾峰彇浠撳簱鍒楄〃
- /// </summary>
- /// <returns></returns>
- Task<List<WmsStoreForAreaOutpur>> GetStreList();
-
- /// <summary>
- /// 搴撳尯鍒楄〃
- /// </summary>
- /// <returns></returns>
- Task<List<AreaForListOuptut>> GetAreaListAsync();
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsInOutStockRecordAppService.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsInOutStockRecordAppService.cs"
deleted file mode 100644
index 6bc1c06..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsInOutStockRecordAppService.cs"
+++ /dev/null
@@ -1,46 +0,0 @@
-using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsInOutStockRecord;
-using Volo.Abp.Application.Services;
-
-namespace CMS.Plugin.HIAWms.Application.Contracts.Services;
-
-/// <summary>
-/// 鍑哄叆搴撹褰曡〃搴旂敤鏈嶅姟鎺ュ彛
-/// </summary>
-public interface IWmsInOutStockRecordAppService : ICrudAppService<WmsInOutStockRecordDto, Guid, GetWmsInOutStockRecordInput, WmsInOutStockRecordCreateDto, WmsInOutStockRecordUpdateDto>
-{
- /// <summary>
- /// 鍏嬮殕鍑哄叆搴撹褰曡〃
- /// </summary>
- /// <param name="ids"></param>
- /// <returns></returns>
- Task<List<WmsInOutStockRecordDto>> CloneAsync(IEnumerable<Guid> ids);
-
- /// <summary>
- /// 鍒犻櫎鍑哄叆搴撹褰曡〃
- /// </summary>
- /// <param name="ids"></param>
- /// <returns></returns>
- Task DeleteManyAsync(IEnumerable<Guid> ids);
-
- /// <summary>
- /// 璋冩暣鎺掑簭鍑哄叆搴撹褰曡〃
- /// </summary>
- /// <param name="id"></param>
- /// <param name="sort"></param>
- /// <returns></returns>
- Task AdjustSortAsync(Guid id, int sort);
-
- /// <summary>
- /// 瀵煎叆鍑哄叆搴撹褰曡〃
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- Task ImportAsync(WmsInOutStockRecordsImportModel input);
-
- /// <summary>
- /// 瀵煎嚭鍑哄叆搴撹褰曡〃
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsInOutStockRecordInput input);
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsMaterialAppService.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsMaterialAppService.cs"
deleted file mode 100644
index d678bc4..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsMaterialAppService.cs"
+++ /dev/null
@@ -1,46 +0,0 @@
-using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterial;
-using Volo.Abp.Application.Services;
-
-namespace CMS.Plugin.HIAWms.Application.Contracts.Services;
-
-/// <summary>
-/// 鐗╂枡鍩虹淇℃伅琛ㄥ簲鐢ㄦ湇鍔℃帴鍙�
-/// </summary>
-public interface IWmsMaterialAppService : ICrudAppService<WmsMaterialDto, Guid, GetWmsMaterialInput, WmsMaterialCreateDto, WmsMaterialUpdateDto>
-{
- /// <summary>
- /// 鍏嬮殕鐗╂枡鍩虹淇℃伅琛�
- /// </summary>
- /// <param name="ids"></param>
- /// <returns></returns>
- Task<List<WmsMaterialDto>> CloneAsync(IEnumerable<Guid> ids);
-
- /// <summary>
- /// 鍒犻櫎鐗╂枡鍩虹淇℃伅琛�
- /// </summary>
- /// <param name="ids"></param>
- /// <returns></returns>
- Task DeleteManyAsync(IEnumerable<Guid> ids);
-
- /// <summary>
- /// 璋冩暣鎺掑簭鐗╂枡鍩虹淇℃伅琛�
- /// </summary>
- /// <param name="id"></param>
- /// <param name="sort"></param>
- /// <returns></returns>
- Task AdjustSortAsync(Guid id, int sort);
-
- /// <summary>
- /// 瀵煎叆鐗╂枡鍩虹淇℃伅琛�
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- Task ImportAsync(WmsMaterialsImportModel input);
-
- /// <summary>
- /// 瀵煎嚭鐗╂枡鍩虹淇℃伅琛�
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsMaterialInput input);
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsPlaceAppService.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsPlaceAppService.cs"
deleted file mode 100644
index 5aa95c9..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsPlaceAppService.cs"
+++ /dev/null
@@ -1,46 +0,0 @@
-using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlaces;
-using Volo.Abp.Application.Services;
-
-namespace CMS.Plugin.HIAWms.Application.Contracts.Services;
-
-/// <summary>
-/// WmsPlace搴旂敤鏈嶅姟
-/// </summary>
-public interface IWmsPlaceAppService : ICrudAppService<WmsPlaceDto, Guid, GetWmsPlacesInput, WmsPlaceCreateDto, WmsPlaceUpdateDto>
-{
- /// <summary>
- /// Clones the asynchronous.
- /// </summary>
- /// <param name="ids">The ids.</param>
- /// <returns></returns>
- Task<List<WmsPlaceDto>> CloneAsync(IEnumerable<Guid> ids);
-
- /// <summary>
- /// Deletes the many asynchronous.
- /// </summary>
- /// <param name="ids">The ids.</param>
- /// <returns></returns>
- Task DeleteManyAsync(IEnumerable<Guid> ids);
-
- /// <summary>
- /// Adjusts the sort asynchronous.
- /// </summary>
- /// <param name="id">The identifier.</param>
- /// <param name="sort">The sort.</param>
- /// <returns></returns>
- Task AdjustSortAsync(Guid id, int sort);
-
- /// <summary>
- /// Imports the asynchronous.
- /// </summary>
- /// <param name="input">The input.</param>
- /// <returns></returns>
- Task ImportAsync(WmsPlacesImportModel input);
-
- /// <summary>
- /// Exports the asynchronous.
- /// </summary>
- /// <param name="input">The input.</param>
- /// <returns></returns>
- Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsPlacesInput input);
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsStoreAppService.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsStoreAppService.cs"
deleted file mode 100644
index 91e1035..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsStoreAppService.cs"
+++ /dev/null
@@ -1,46 +0,0 @@
-using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStores;
-using Volo.Abp.Application.Services;
-
-namespace CMS.Plugin.HIAWms.Application.Contracts.Services;
-
-/// <summary>
-/// WmsStore搴旂敤鏈嶅姟
-/// </summary>
-public interface IWmsStoreAppService : ICrudAppService<WmsStoreDto, Guid, GetWmsStoresInput, WmsStoreCreateDto, WmsStoreUpdateDto>
-{
- /// <summary>
- /// Clones the asynchronous.
- /// </summary>
- /// <param name="ids">The ids.</param>
- /// <returns></returns>
- Task<List<WmsStoreDto>> CloneAsync(IEnumerable<Guid> ids);
-
- /// <summary>
- /// Deletes the many asynchronous.
- /// </summary>
- /// <param name="ids">The ids.</param>
- /// <returns></returns>
- Task DeleteManyAsync(IEnumerable<Guid> ids);
-
- /// <summary>
- /// Adjusts the sort asynchronous.
- /// </summary>
- /// <param name="id">The identifier.</param>
- /// <param name="sort">The sort.</param>
- /// <returns></returns>
- Task AdjustSortAsync(Guid id, int sort);
-
- /// <summary>
- /// Imports the asynchronous.
- /// </summary>
- /// <param name="input">The input.</param>
- /// <returns></returns>
- Task ImportAsync(WmsStoresImportModel input);
-
- /// <summary>
- /// Exports the asynchronous.
- /// </summary>
- /// <param name="input">The input.</param>
- /// <returns></returns>
- Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsStoresInput input);
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application/CMS.Plugin.HIAWms.Application.csproj" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application/CMS.Plugin.HIAWms.Application.csproj"
deleted file mode 100644
index 17d2238..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application/CMS.Plugin.HIAWms.Application.csproj"
+++ /dev/null
@@ -1,27 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
- <Import Project="../../common.props" />
- <Import Project="../../configureawait.props" />
-
- <PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
- </PropertyGroup>
-
- <ItemGroup>
- <PackageReference Include="Volo.Abp.Dapper" Version="$(ABPPackageVersion)" />
- <PackageReference Include="Volo.Abp.AutoMapper" Version="$(ABPPackageVersion)" />
- <PackageReference Include="Volo.Abp.Ddd.Application" Version="$(ABPPackageVersion)" />
- </ItemGroup>
-
- <ItemGroup>
- <ProjectReference Include="..\CMS.Plugin.HIAWms.Application.Contracts\CMS.Plugin.HIAWms.Application.Contracts.csproj" />
- <ProjectReference Include="..\CMS.Plugin.HIAWms.Domain\CMS.Plugin.HIAWms.Domain.csproj" />
- </ItemGroup>
-
- <ItemGroup>
- <Reference Include="CmsQueryExtensions">
- <HintPath>..\..\..\..\..\CommonDLL\CmsQueryExtensions.dll</HintPath>
- </Reference>
- </ItemGroup>
-
-</Project>
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application/CMSPluginAppService.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application/CMSPluginAppService.cs"
deleted file mode 100644
index e3be13d..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application/CMSPluginAppService.cs"
+++ /dev/null
@@ -1,19 +0,0 @@
-using CMS.Plugin.HIAWms.Domain.Shared.Localization;
-using Volo.Abp.Application.Services;
-
-namespace CMS.Plugin.HIAWms.Application;
-
-/// <summary>
-/// Inherit your application services from this class.
-/// </summary>
-public abstract class CMSPluginAppService : ApplicationService
-{
- /// <summary>
- /// Initializes a new instance of the <see cref="CMSPluginAppService"/> class.
- /// </summary>
- protected CMSPluginAppService()
- {
- ObjectMapperContext = typeof(CMSPluginApplicationModule);
- LocalizationResource = typeof(HIAWmsResource);
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application/CMSPluginApplicationModule.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application/CMSPluginApplicationModule.cs"
deleted file mode 100644
index 31f8e4d..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application/CMSPluginApplicationModule.cs"
+++ /dev/null
@@ -1,31 +0,0 @@
-using CMS.Plugin.HIAWms.Application.Contracts;
-using CMS.Plugin.HIAWms.Domain;
-using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp.Application;
-using Volo.Abp.AutoMapper;
-using Volo.Abp.EventBus;
-using Volo.Abp.Modularity;
-
-namespace CMS.Plugin.HIAWms.Application;
-
-/// <summary>
-/// 鎻掍欢搴旂敤鏈嶅姟妯″潡
-/// </summary>
-[DependsOn(
- typeof(CMSPluginDomainModule),
- typeof(CMSPluginApplicationContractsModule),
- typeof(AbpAutoMapperModule),
- typeof(AbpEventBusModule),
- typeof(AbpDddApplicationModule)
- )]
-public class CMSPluginApplicationModule : AbpModule
-{
- public override void ConfigureServices(ServiceConfigurationContext context)
- {
- context.Services.AddAutoMapperObjectMapper<CMSPluginApplicationModule>();
- Configure<AbpAutoMapperOptions>(options =>
- {
- options.AddMaps<CMSPluginApplicationModule>(validate: true);
- });
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application/CMSPluginQueryAppService.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application/CMSPluginQueryAppService.cs"
deleted file mode 100644
index c3d13b7..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application/CMSPluginQueryAppService.cs"
+++ /dev/null
@@ -1,19 +0,0 @@
-using CMS.Plugin.HIAWms.Application.Contracts;
-using CMS.Plugin.HIAWms.Domain.Data;
-
-namespace CMS.Plugin.HIAWms.Application;
-
-/// <inheritdoc />
-public class CMSPluginQueryAppService : CMSPluginAppService, ICMSPluginQueryAppService
-{
- private readonly ICMSPluginDapperRepository _dapperRepository;
-
- /// <summary>
- /// Initializes a new instance of the <see cref="CMSPluginQueryAppService"/> class.
- /// </summary>
- /// <param name="dapperRepository">The dapper repository.</param>
- public CMSPluginQueryAppService(ICMSPluginDapperRepository dapperRepository)
- {
- _dapperRepository = dapperRepository;
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application/Implements/WmsAreaAppService.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application/Implements/WmsAreaAppService.cs"
deleted file mode 100644
index e9c095e..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application/Implements/WmsAreaAppService.cs"
+++ /dev/null
@@ -1,324 +0,0 @@
-using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsAreas;
-using CMS.Plugin.HIAWms.Application.Contracts.Services;
-using CMS.Plugin.HIAWms.Domain.WmsAreas;
-using CMS.Plugin.HIAWms.Domain.Shared;
-using CMS.Plugin.HIAWms.Domain.Shared.WmsAreas;
-using Volo.Abp;
-using Volo.Abp.Application.Dtos;
-using Volo.Abp.Data;
-using Volo.Abp.ObjectExtending;
-using CMS.Plugin.HIAWms.Domain.Shared.Util;
-
-namespace CMS.Plugin.HIAWms.Application.Implements;
-
-/// <inheritdoc />
-public class WmsAreaAppService : CMSPluginAppService, IWmsAreaAppService
-{
- private readonly IWmsAreaRepository _wmsareaRepository;
-
- /// <summary>
- /// Initializes a new instance of the <see cref="WmsAreaAppService"/> class.
- /// </summary>
- /// <param name="wmsareaRepository">The task job repository.</param>
- public WmsAreaAppService(IWmsAreaRepository wmsareaRepository)
- {
- _wmsareaRepository = wmsareaRepository;
- }
-
- /// <inheritdoc />
- public virtual async Task<WmsAreaDto> GetAsync(Guid id)
- {
- return ObjectMapper.Map<WmsArea, WmsAreaDto>(await _wmsareaRepository.GetAsync(id));
- }
-
- /// <inheritdoc />
- public virtual async Task<PagedResultDto<WmsAreaDto>> GetListAsync(GetWmsAreasInput input)
- {
- Check.NotNull(input, nameof(input));
-
- if (input.Sorting.IsNullOrWhiteSpace())
- {
- input.Sorting = nameof(WmsArea.Sort);
- }
-
- var specification = new WmsAreaSpecification(input.Name);
- var area = ObjectMapper.Map<GetWmsAreasInput, WmsArea>(input);
- var count = await _wmsareaRepository.GetCountAsync(area,input.Filter, specification);
- var list = await _wmsareaRepository.GetListAsync(area,input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter, specification);
-
- return new PagedResultDto<WmsAreaDto>(count, ObjectMapper.Map<List<WmsArea>, List<WmsAreaDto>>(list));
- }
-
- /// <inheritdoc />
- public virtual async Task<WmsAreaDto> CreateAsync(WmsAreaCreateDto input)
- {
- await CheckCreateOrUpdateDtoAsync(input);
-
- var exist = await _wmsareaRepository.NameExistAsync(input.AreaNo);
- if (exist)
- {
- throw new UserFriendlyException(L[CMSPluginDomainErrorCodes.NameAlreadyExists, input.AreaNo]);
- }
-
- var maxSort = await _wmsareaRepository.GetMaxSortAsync();
- var sort = input.Sort ?? maxSort;
- var wmsarea = ObjectMapper.Map<WmsAreaCreateDto, WmsArea>(input);
- wmsarea.Sort = sort;
- input.MapExtraPropertiesTo(wmsarea, MappingPropertyDefinitionChecks.None);
-
- await _wmsareaRepository.InsertAsync(wmsarea);
-
- if (input.Sort.HasValue && wmsarea.Sort != maxSort)
- {
- await AdjustSortAsync(wmsarea.Id, wmsarea.Sort);
- }
-
- return ObjectMapper.Map<WmsArea, WmsAreaDto>(wmsarea);
- }
-
- /// <inheritdoc />
- public virtual async Task<WmsAreaDto> UpdateAsync(Guid id, WmsAreaUpdateDto input)
- {
- await CheckCreateOrUpdateDtoAsync(input);
-
- var wmsarea = await _wmsareaRepository.GetAsync(id);
- var exist = await _wmsareaRepository.NameExistAsync(input.AreaNo, wmsarea.Id);
- if (exist)
- {
- throw new UserFriendlyException(L[CMSPluginDomainErrorCodes.NameAlreadyExists, input.AreaNo]);
- }
-
- wmsarea.SetConcurrencyStampIfNotNull(input.ConcurrencyStamp);
- input.MapExtraPropertiesTo(wmsarea, MappingPropertyDefinitionChecks.None);
-
- wmsarea.AreaName = input.AreaName;
- wmsarea.AreaDesc = input.AreaDesc;
- wmsarea.AreaStatus = input.AreaStatus;
- wmsarea.AreaType = input.AreaType;
- wmsarea.StoreCode = input.StoreCode;
- wmsarea.StoreName = input.StoreName;
-
- await _wmsareaRepository.UpdateAsync(wmsarea);
-
- return ObjectMapper.Map<WmsArea, WmsAreaDto>(wmsarea);
- }
-
- /// <inheritdoc />
- public async Task<List<WmsAreaDto>> CloneAsync(IEnumerable<Guid> ids)
- {
- var wmsareas = new List<WmsArea>();
- if (ids != null)
- {
- var sort = await _wmsareaRepository.GetMaxSortAsync();
- foreach (var id in ids)
- {
- var wmsarea = await _wmsareaRepository.FindAsync(id);
- if (wmsarea != null)
- {
- var name = wmsarea.AreaNo + WmsAreaConsts.CloneTag;
- var notExist = false;
- while (!notExist)
- {
- var exist = await _wmsareaRepository.NameExistAsync(name);
- if (exist || wmsareas.Any(x => x.AreaNo == name))
- {
- name += WmsAreaConsts.CloneTag;
- continue;
- }
-
- notExist = true;
- }
-
- wmsareas.Add(wmsarea);
- }
- }
- }
-
- return ObjectMapper.Map<List<WmsArea>, List<WmsAreaDto>>(wmsareas);
- }
-
- /// <inheritdoc />
- public virtual Task DeleteAsync(Guid id)
- {
- return _wmsareaRepository.DeleteAsync(id);
- }
-
- /// <inheritdoc />
- public async Task DeleteManyAsync(IEnumerable<Guid> ids)
- {
- foreach (var id in ids)
- {
- await DeleteAsync(id);
- }
- }
-
- /// <inheritdoc />
- public virtual async Task AdjustSortAsync(Guid id, int sort)
- {
- var list = await _wmsareaRepository.GetListAsync(null,nameof(WmsArea.Sort));
- if (list != null && list.Any())
- {
- var initSort = 1;
- list.ForEach(x => x.AdjustSort(initSort++));
- var entity = list.FirstOrDefault(x => x.Id == id);
- if (entity != null)
- {
- if (sort == 1)
- {
- list.Where(x => x.Id != id).ToList()?.ForEach(x => x.AdjustSort(x.Sort + 1));
- }
- else if (entity.Sort > sort)
- {
- list.Where(x => x.Id != id && x.Sort >= sort).ToList()?.ForEach(x => x.AdjustSort(x.Sort + 1));
- list.Where(x => x.Id != id && x.Sort < sort).ToList()?.ForEach(x => x.AdjustSort(x.Sort - 1));
- }
- else if (entity.Sort < sort)
- {
- list.Where(x => x.Id != id && x.Sort > sort).ToList()?.ForEach(x => x.AdjustSort(x.Sort + 1));
- list.Where(x => x.Id != id && x.Sort <= sort).ToList()?.ForEach(x => x.AdjustSort(x.Sort - 1));
- }
-
- entity.AdjustSort(sort);
- }
- }
-
- await _wmsareaRepository.UpdateManyAsync(list);
- }
-
- /// <inheritdoc />
- public async Task ImportAsync(WmsAreasImportModel input)
- {
- Check.NotNull(input, nameof(input));
-
- var wmsareaCreateDtos = new List<(int RowIndex, WmsAreaCreateDto Item)>();
- var wmsareaUpdateDtos = new List<(int RowIndex, Guid Id, WmsAreaUpdateDto Item)>();
- var wmsareas = input.WmsAreas;
-
- if (wmsareas != null && wmsareas.Any())
- {
- #region 瀵煎叆鏍￠獙
-
- // 鍒ゆ柇鍚嶇О鏄惁閲嶅锛屽苟杈撳嚭绗嚑琛岄噸澶�
- var duplicateWmsAreas = wmsareas.GroupBy(x => x.AreaNo).Where(x => x.Count() > 1).ToList();
- if (duplicateWmsAreas?.Any() == true)
- {
- var duplicateWmsAreaMsgs = duplicateWmsAreas.Select(x => $"绗� {string.Join(",", x.Select(x => x.RowIndex))} 琛岋細{x.Key} 鍚嶇О閲嶅");
- var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝 {string.Join(",", duplicateWmsAreaMsgs)}锛岀粓姝㈠鍏�";
- throw new UserFriendlyException(errorMsg);
- }
-
- #endregion
-
- foreach (var wmsarea in wmsareas)
- {
- if (wmsarea.AreaNo.IsNullOrWhiteSpace() && wmsarea.AreaName.IsNullOrWhiteSpace())
- {
- continue;
- }
-
- if (wmsarea.AreaName.IsNullOrWhiteSpace())
- {
- var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝绗瑊wmsarea.RowIndex}琛岋細WmsArea鍚嶇О涓嶈兘涓虹┖";
- throw new UserFriendlyException(errorMsg);
- }
-
- var oldWmsArea = await _wmsareaRepository.FindByNameAsync(wmsarea.AreaName);
- if (oldWmsArea != null)
- {
- var wmsareaUpdateDto = new WmsAreaUpdateDto
- {
- AreaName = wmsarea.AreaName,
- AreaDesc = wmsarea.AreaDesc,
- AreaStatus = wmsarea.AreaStatus,
- AreaType = wmsarea.AreaType,
- StoreCode = wmsarea.StoreCode,
- StoreName = wmsarea.StoreName,
- Remark = wmsarea.Remark,
- };
-
- wmsareaUpdateDtos.Add((wmsarea.RowIndex, oldWmsArea.Id, wmsareaUpdateDto));
- }
- else
- {
- var wmsareaCreateDto = new WmsAreaCreateDto
- {
- AreaName = wmsarea.AreaName,
- AreaDesc = wmsarea.AreaDesc,
- AreaStatus = wmsarea.AreaStatus,
- AreaType = wmsarea.AreaType,
- StoreCode = wmsarea.StoreCode,
- StoreName = wmsarea.StoreName,
- Remark = wmsarea.Remark,
- };
-
- wmsareaCreateDtos.Add((wmsarea.RowIndex, wmsareaCreateDto));
- }
- }
- }
-
- // 鏂板
- foreach (var wmsareaDto in wmsareaCreateDtos)
- {
- try
- {
- await CreateAsync(wmsareaDto.Item);
- }
- catch (Exception e)
- {
- var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝绗瑊wmsareaDto.RowIndex}琛岋細{e.Message}锛岀粓姝㈠鍏�";
- throw new UserFriendlyException(errorMsg);
- }
- }
-
- // 鏇存柊
- foreach (var wmsareaDto in wmsareaUpdateDtos)
- {
- try
- {
- await UpdateAsync(wmsareaDto.Id, wmsareaDto.Item);
- }
- catch (Exception e)
- {
- var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝绗瑊wmsareaDto.RowIndex}琛岋細{e.Message}锛岀粓姝㈠鍏�";
- throw new UserFriendlyException(errorMsg);
- }
- }
- }
-
- /// <inheritdoc />
- public async Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsAreasInput input)
- {
- Check.NotNull(input, nameof(input));
-
- if (input.Sorting.IsNullOrWhiteSpace())
- {
- input.Sorting = nameof(WmsArea.Sort);
- }
-
- var specification = new WmsAreaSpecification(input.Name);
- var area = ObjectMapper.Map<GetWmsAreasInput, WmsArea>(input);
- var list = await _wmsareaRepository.GetListAsync(area,input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter, specification, includeDetails: true);
- var result = ObjectMapper.Map<List<WmsArea>, List<WmsAreaDto>>(list);
-
- var sheets = new Dictionary<string, object>
- {
- ["閰嶇疆"] = ExportHelper.ConvertListToExportData(result),
- };
-
- var fileName = result.Count > 1 ? "WmsArea鍒楄〃" : result.Count == 1 ? result.First()?.AreaName : "WmsArea妯＄増";
- return (sheets, fileName);
- }
-
- /// <summary>
- /// Checks the create or update dto asynchronous.
- /// </summary>
- /// <param name="input">The input.</param>
- protected Task CheckCreateOrUpdateDtoAsync(WmsAreaCreateOrUpdateDtoBase input)
- {
- Check.NotNull(input, nameof(input));
- Check.NotNullOrWhiteSpace(input.AreaNo, "缂栧彿", WmsAreaConsts.MaxCodeLength);
- Check.NotNullOrWhiteSpace(input.AreaName, "鍚嶇О", WmsAreaConsts.MaxNameLength);
- Check.Length(input.Remark, "澶囨敞", WmsAreaConsts.MaxRemarkLength);
- return Task.CompletedTask;
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application/Implements/WmsContainerAppService.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application/Implements/WmsContainerAppService.cs"
deleted file mode 100644
index eba8903..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application/Implements/WmsContainerAppService.cs"
+++ /dev/null
@@ -1,336 +0,0 @@
-using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsContainers;
-using CMS.Plugin.HIAWms.Application.Contracts.Services;
-using CMS.Plugin.HIAWms.Domain.WmsContainers;
-using CMS.Plugin.HIAWms.Domain.Shared;
-using CMS.Plugin.HIAWms.Domain.Shared.WmsContainers;
-using Volo.Abp;
-using Volo.Abp.Application.Dtos;
-using Volo.Abp.Data;
-using Volo.Abp.ObjectExtending;
-using CMS.Plugin.HIAWms.Domain.Shared.Util;
-
-namespace CMS.Plugin.HIAWms.Application.Implements;
-
-/// <inheritdoc />
-public class WmsContainerAppService : CMSPluginAppService, IWmsContainerAppService
-{
- private readonly IWmsContainerRepository _wmscontainerRepository;
-
- /// <summary>
- /// Initializes a new instance of the <see cref="WmsContainerAppService"/> class.
- /// </summary>
- /// <param name="wmscontainerRepository">The task job repository.</param>
- public WmsContainerAppService(IWmsContainerRepository wmscontainerRepository)
- {
- _wmscontainerRepository = wmscontainerRepository;
- }
-
- /// <inheritdoc />
- public virtual async Task<WmsContainerDto> GetAsync(Guid id)
- {
- return ObjectMapper.Map<WmsContainer, WmsContainerDto>(await _wmscontainerRepository.GetAsync(id));
- }
-
- /// <inheritdoc />
- public virtual async Task<PagedResultDto<WmsContainerDto>> GetListAsync(GetWmsContainersInput input)
- {
- Check.NotNull(input, nameof(input));
-
- if (input.Sorting.IsNullOrWhiteSpace())
- {
- input.Sorting = nameof(WmsContainer.Sort);
- }
-
- var specification = new WmsContainerSpecification(input.Name);
- var container = ObjectMapper.Map < GetWmsContainersInput, WmsContainer>(input);
- var count = await _wmscontainerRepository.GetCountAsync(container,input.Filter, specification);
- var list = await _wmscontainerRepository.GetListAsync(container,input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter, specification);
-
- return new PagedResultDto<WmsContainerDto>(count, ObjectMapper.Map<List<WmsContainer>, List<WmsContainerDto>>(list));
- }
-
- /// <inheritdoc />
- public virtual async Task<WmsContainerDto> CreateAsync(WmsContainerCreateDto input)
- {
- await CheckCreateOrUpdateDtoAsync(input);
-
- var exist = await _wmscontainerRepository.NameExistAsync(input.ContainerNo);
- if (exist)
- {
- throw new UserFriendlyException(L[CMSPluginDomainErrorCodes.NameAlreadyExists, input.ContainerNo]);
- }
-
- var maxSort = await _wmscontainerRepository.GetMaxSortAsync();
- var sort = input.Sort ?? maxSort;
- var wmscontainer = ObjectMapper.Map<WmsContainerCreateDto,WmsContainer>(input);
- input.MapExtraPropertiesTo(wmscontainer, MappingPropertyDefinitionChecks.None);
- wmscontainer.Sort = sort;
- await _wmscontainerRepository.InsertAsync(wmscontainer);
-
- if (input.Sort.HasValue && wmscontainer.Sort != maxSort)
- {
- await AdjustSortAsync(wmscontainer.Id, wmscontainer.Sort);
- }
-
- return ObjectMapper.Map<WmsContainer, WmsContainerDto>(wmscontainer);
- }
-
- /// <inheritdoc />
- public virtual async Task<WmsContainerDto> UpdateAsync(Guid id, WmsContainerUpdateDto input)
- {
- await CheckCreateOrUpdateDtoAsync(input);
-
- var wmscontainer = await _wmscontainerRepository.GetAsync(id);
- var exist = await _wmscontainerRepository.NameExistAsync(input.ContainerNo, wmscontainer.Id);
- if (exist)
- {
- throw new UserFriendlyException(L[CMSPluginDomainErrorCodes.NameAlreadyExists, input.ContainerNo]);
- }
-
- wmscontainer.SetConcurrencyStampIfNotNull(input.ConcurrencyStamp);
- input.MapExtraPropertiesTo(wmscontainer, MappingPropertyDefinitionChecks.None);
-
- wmscontainer.ContainerStatus = input.ContainerStatus;
- wmscontainer.ContainerType = input.ContainerType;
- wmscontainer.SpecLength = input.SpecLength;
- wmscontainer.SpecWidth = input.SpecWidth;
- wmscontainer.SpecHeight = input.SpecHeight;
- wmscontainer.LimitLength = input.LimitLength;
- wmscontainer.LimitWidth = input.LimitWidth;
- wmscontainer.LimitHeight = input.LimitHeight;
- wmscontainer.MaxWeight = input.MaxWeight;
- wmscontainer.MaterialNumber = input.MaterialNumber;
- wmscontainer.ExceptionNumber = input.ExceptionNumber;
-
- await _wmscontainerRepository.UpdateAsync(wmscontainer);
-
- return ObjectMapper.Map<WmsContainer, WmsContainerDto>(wmscontainer);
- }
-
- /// <inheritdoc />
- public async Task<List<WmsContainerDto>> CloneAsync(IEnumerable<Guid> ids)
- {
- var wmscontainers = new List<WmsContainer>();
- if (ids != null)
- {
- var sort = await _wmscontainerRepository.GetMaxSortAsync();
- foreach (var id in ids)
- {
- var wmscontainer = await _wmscontainerRepository.FindAsync(id);
- if (wmscontainer != null)
- {
- var containerNo = wmscontainer.ContainerNo + WmsContainerConsts.CloneTag;
- var notExist = false;
- while (!notExist)
- {
- var exist = await _wmscontainerRepository.NameExistAsync(containerNo);
- if (exist || wmscontainers.Any(x => x.ContainerNo == containerNo))
- {
- containerNo += WmsContainerConsts.CloneTag;
- continue;
- }
-
- notExist = true;
- }
-
- //wmscontainer = await _wmscontainerRepository.InsertAsync(wmscontainer.Clone(GuidGenerator.Create(), containerNo, sort++));
- wmscontainers.Add(wmscontainer);
- }
- }
- }
-
- return ObjectMapper.Map<List<WmsContainer>, List<WmsContainerDto>>(wmscontainers);
- }
-
- /// <inheritdoc />
- public virtual Task DeleteAsync(Guid id)
- {
- return _wmscontainerRepository.DeleteAsync(id);
- }
-
- /// <inheritdoc />
- public async Task DeleteManyAsync(IEnumerable<Guid> ids)
- {
- foreach (var id in ids)
- {
- await DeleteAsync(id);
- }
- }
-
- /// <inheritdoc />
- public virtual async Task AdjustSortAsync(Guid id, int sort)
- {
- var list = await _wmscontainerRepository.GetListAsync(null,nameof(WmsContainer.Sort));
- if (list != null && list.Any())
- {
- var initSort = 1;
- list.ForEach(x => x.AdjustSort(initSort++));
- var entity = list.FirstOrDefault(x => x.Id == id);
- if (entity != null)
- {
- if (sort == 1)
- {
- list.Where(x => x.Id != id).ToList()?.ForEach(x => x.AdjustSort(x.Sort + 1));
- }
- else if (entity.Sort > sort)
- {
- list.Where(x => x.Id != id && x.Sort >= sort).ToList()?.ForEach(x => x.AdjustSort(x.Sort + 1));
- list.Where(x => x.Id != id && x.Sort < sort).ToList()?.ForEach(x => x.AdjustSort(x.Sort - 1));
- }
- else if (entity.Sort < sort)
- {
- list.Where(x => x.Id != id && x.Sort > sort).ToList()?.ForEach(x => x.AdjustSort(x.Sort + 1));
- list.Where(x => x.Id != id && x.Sort <= sort).ToList()?.ForEach(x => x.AdjustSort(x.Sort - 1));
- }
-
- entity.AdjustSort(sort);
- }
- }
-
- await _wmscontainerRepository.UpdateManyAsync(list);
- }
-
- /// <inheritdoc />
- public async Task ImportAsync(WmsContainersImportModel input)
- {
- Check.NotNull(input, nameof(input));
-
- var wmscontainerCreateDtos = new List<(int RowIndex, WmsContainerCreateDto Item)>();
- var wmscontainerUpdateDtos = new List<(int RowIndex, Guid Id, WmsContainerUpdateDto Item)>();
- var wmscontainers = input.WmsContainers;
-
- if (wmscontainers != null && wmscontainers.Any())
- {
- #region 瀵煎叆鏍￠獙
-
- // 鍒ゆ柇鍚嶇О鏄惁閲嶅锛屽苟杈撳嚭绗嚑琛岄噸澶�
- var duplicateWmsContainers = wmscontainers.GroupBy(x => x.ContainerNo).Where(x => x.Count() > 1).ToList();
- if (duplicateWmsContainers?.Any() == true)
- {
- var duplicateWmsContainerMsgs = duplicateWmsContainers.Select(x => $"绗� {string.Join(",", x.Select(x => x.RowIndex))} 琛岋細{x.Key} 鍚嶇О閲嶅");
- var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝 {string.Join(",", duplicateWmsContainerMsgs)}锛岀粓姝㈠鍏�";
- throw new UserFriendlyException(errorMsg);
- }
-
- #endregion
-
- foreach (var wmscontainer in wmscontainers)
- {
- if (wmscontainer.ContainerNo.IsNullOrWhiteSpace() && wmscontainer.ContainerNo.IsNullOrWhiteSpace())
- {
- continue;
- }
-
- if (wmscontainer.ContainerNo.IsNullOrWhiteSpace())
- {
- var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝绗瑊wmscontainer.RowIndex}琛岋細WmsContainer鍚嶇О涓嶈兘涓虹┖";
- throw new UserFriendlyException(errorMsg);
- }
-
- var oldWmsContainer = await _wmscontainerRepository.FindByNameAsync(wmscontainer.ContainerNo);
- if (oldWmsContainer != null)
- {
- var wmscontainerUpdateDto = new WmsContainerUpdateDto
- {
- ContainerNo = wmscontainer.ContainerNo,
- ContainerType = wmscontainer.ContainerType,
- ContainerStatus = wmscontainer.ContainerStatus,
- SpecLength = wmscontainer.SpecLength,
- SpecWidth = wmscontainer.SpecWidth,
- SpecHeight = wmscontainer.SpecHeight,
- LimitLength = wmscontainer.LimitLength,
- LimitWidth = wmscontainer.LimitWidth,
- LimitHeight = wmscontainer.LimitHeight,
- MaxWeight = wmscontainer.MaxWeight,
- Remark = wmscontainer.Remark,
- };
-
- wmscontainerUpdateDtos.Add((wmscontainer.RowIndex, oldWmsContainer.Id, wmscontainerUpdateDto));
- }
- else
- {
- var wmscontainerCreateDto = new WmsContainerCreateDto
- {
- ContainerNo = wmscontainer.ContainerNo,
- ContainerType = wmscontainer.ContainerType,
- ContainerStatus = wmscontainer.ContainerStatus,
- SpecLength = wmscontainer.SpecLength,
- SpecWidth = wmscontainer.SpecWidth,
- SpecHeight = wmscontainer.SpecHeight,
- LimitLength = wmscontainer.LimitLength,
- LimitWidth = wmscontainer.LimitWidth,
- LimitHeight = wmscontainer.LimitHeight,
- MaxWeight = wmscontainer.MaxWeight,
- Remark = wmscontainer.Remark
- };
-
- wmscontainerCreateDtos.Add((wmscontainer.RowIndex, wmscontainerCreateDto));
- }
- }
- }
-
- // 鏂板
- foreach (var wmscontainerDto in wmscontainerCreateDtos)
- {
- try
- {
- await CreateAsync(wmscontainerDto.Item);
- }
- catch (Exception e)
- {
- var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝绗瑊wmscontainerDto.RowIndex}琛岋細{e.Message}锛岀粓姝㈠鍏�";
- throw new UserFriendlyException(errorMsg);
- }
- }
-
- // 鏇存柊
- foreach (var wmscontainerDto in wmscontainerUpdateDtos)
- {
- try
- {
- await UpdateAsync(wmscontainerDto.Id, wmscontainerDto.Item);
- }
- catch (Exception e)
- {
- var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝绗瑊wmscontainerDto.RowIndex}琛岋細{e.Message}锛岀粓姝㈠鍏�";
- throw new UserFriendlyException(errorMsg);
- }
- }
- }
-
- /// <inheritdoc />
- public async Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsContainersInput input)
- {
- Check.NotNull(input, nameof(input));
-
- if (input.Sorting.IsNullOrWhiteSpace())
- {
- input.Sorting = nameof(WmsContainer.Sort);
- }
-
- var specification = new WmsContainerSpecification(input.Name);
- var container = ObjectMapper.Map<GetWmsContainersInput, WmsContainer>(input);
- var list = await _wmscontainerRepository.GetListAsync(container,input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter, specification, includeDetails: true);
- var result = ObjectMapper.Map<List<WmsContainer>, List<WmsContainerDto>>(list);
-
- var sheets = new Dictionary<string, object>
- {
- ["閰嶇疆"] = ExportHelper.ConvertListToExportData(result),
- };
-
- var fileName = result.Count > 1 ? "WmsContainer鍒楄〃" : result.Count == 1 ? result.First()?.ContainerNo : "WmsContainer妯＄増";
- return (sheets, fileName);
- }
-
- /// <summary>
- /// Checks the create or update dto asynchronous.
- /// </summary>
- /// <param name="input">The input.</param>
- protected Task CheckCreateOrUpdateDtoAsync(WmsContainerCreateOrUpdateDtoBase input)
- {
- Check.NotNull(input, nameof(input));
- Check.NotNullOrWhiteSpace(input.ContainerNo, "缂栧彿", WmsContainerConsts.MaxCodeLength);
- Check.Length(input.Remark, "澶囨敞", WmsContainerConsts.MaxRemarkLength);
- return Task.CompletedTask;
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application/Implements/WmsEnumAppService.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application/Implements/WmsEnumAppService.cs"
deleted file mode 100644
index 0c133ec..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application/Implements/WmsEnumAppService.cs"
+++ /dev/null
@@ -1,69 +0,0 @@
-锘縰sing CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsEnumDto;
-using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStores;
-using CMS.Plugin.HIAWms.Application.Contracts.Services;
-using CMS.Plugin.HIAWms.Domain.Shared.Util;
-using CMS.Plugin.HIAWms.Domain.WmsAreas;
-using CMS.Plugin.HIAWms.Domain.WmsStores;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using static CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsAreas.WmsAreaCreateOrUpdateDtoBase;
-
-namespace CMS.Plugin.HIAWms.Application.Implements
-{
- /// <summary>
- /// 鏋氫妇绫诲瀷鎺ュ彛瀹炵幇
- /// </summary>
- public class WmsEnumAppService : CMSPluginAppService, IWmsEnumAppService
- {
- private readonly IWmsStoreRepository _storeRepository;
- private readonly IWmsAreaRepository _wmsAreaRepository;
-
- public WmsEnumAppService(IWmsStoreRepository storeRepository, IWmsAreaRepository wmsAreaRepository)
- {
- _storeRepository = storeRepository;
- _wmsAreaRepository = wmsAreaRepository;
- }
-
- public List<EnumItem> GetEnumDataList(WmsEnumInput enumInput)
- {
- return EnumHelper.GetEnumItems(enumInput.EnumName);
- }
-
- /// <summary>
- /// 鑾峰彇浠撳簱鍒楄〃
- /// </summary>
- /// <returns></returns>
- public async Task<List<WmsStoreForAreaOutpur>> GetStreList()
- {
- var list = await _storeRepository.GetListForSelectAsync();
- if (list == null || list.Count <= 0) { return new List<WmsStoreForAreaOutpur>(); }
-
- var result = list.Select(x => new WmsStoreForAreaOutpur
- {
- StoreCode = x.StoreCode,
- StoreName = x.StoreName,
- }).ToList();
- return result;
- }
-
- /// <summary>
- /// 搴撳尯鍒楄〃
- /// </summary>
- /// <returns></returns>
- public async Task<List<AreaForListOuptut>> GetAreaListAsync()
- {
- var list = await _wmsAreaRepository.GetListForSelectAsync();
- if (list == null || list.Count <= 0) { return new List<AreaForListOuptut>(); }
- var result = list.Select(x=>new AreaForListOuptut
- {
- AreaName = x.AreaName,
- AreaNo = x.AreaNo,
- }).ToList();
-
- return result;
- }
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application/Implements/WmsInOutStockRecordAppService.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application/Implements/WmsInOutStockRecordAppService.cs"
deleted file mode 100644
index 34c8675..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application/Implements/WmsInOutStockRecordAppService.cs"
+++ /dev/null
@@ -1,436 +0,0 @@
-using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsInOutStockRecord;
-using CMS.Plugin.HIAWms.Application.Contracts.Services;
-using CMS.Plugin.HIAWms.Domain.Shared;
-using CMS.Plugin.HIAWms.Domain.Shared.Util;
-using CMS.Plugin.HIAWms.Domain.WmsInOutStockRecord;
-using CmsQueryExtensions.Extension;
-using System.Linq.Expressions;
-using Volo.Abp;
-using Volo.Abp.Application.Dtos;
-using Volo.Abp.Data;
-using Volo.Abp.ObjectExtending;
-using Volo.Abp.ObjectMapping;
-
-namespace CMS.Plugin.HIAWms.Application.Implements;
-
-/// <summary>
-/// 鍑哄叆搴撹褰曡〃搴旂敤鏈嶅姟
-/// </summary>
-public class WmsInOutStockRecordAppService : CMSPluginAppService, IWmsInOutStockRecordAppService
-{
- private readonly IWmsInOutStockRecordRepository wmsInOutStockRecordRepository;
-
- /// <summary>
- /// Initializes a new instance of the <see cref="WmsInOutStockRecordAppService"/> class.
- /// </summary>
- /// <param name="WmsInOutStockRecordRepository">The task job repository.</param>
- public WmsInOutStockRecordAppService(IWmsInOutStockRecordRepository _WmsInOutStockRecordRepository)
- {
- wmsInOutStockRecordRepository = _WmsInOutStockRecordRepository;
- }
-
- /// <summary>
- /// 鑾峰彇鎸囧畾鍑哄叆搴撹褰曡〃
- /// </summary>
- /// <param name="id"></param>
- /// <returns></returns>
- public virtual async Task<WmsInOutStockRecordDto> GetAsync(Guid id)
- {
- return ObjectMapper.Map<WmsInOutStockRecord, WmsInOutStockRecordDto>(await wmsInOutStockRecordRepository.GetAsync(id));
- }
-
- /// <summary>
- /// 鍒嗛〉鑾峰彇鍑哄叆搴撹褰曡〃
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- public virtual async Task<PagedResultDto<WmsInOutStockRecordDto>> GetListAsync(GetWmsInOutStockRecordInput input)
- {
- Check.NotNull(input, nameof(input));
-
- if (input.Sorting.IsNullOrWhiteSpace())
- {
- input.Sorting = nameof(WmsInOutStockRecord.Sort);
- }
-
- #region 鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
-
- //鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
- var whereConditions = DynamicGetQueryParams(input);
-
- #endregion
-
- var count = await wmsInOutStockRecordRepository.GetCountAsync(whereConditions);
- var list = await wmsInOutStockRecordRepository.GetListAsync(whereConditions, input.Sorting, input.MaxResultCount, input.SkipCount);
-
- return new PagedResultDto<WmsInOutStockRecordDto>(count, ObjectMapper.Map<List<WmsInOutStockRecord>, List<WmsInOutStockRecordDto>>(list));
- }
-
- /// <summary>
- /// 鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
- /// </summary>
- /// <param name="input">杈撳叆鍙傛暟</param>
- /// <returns></returns>
- private FunReturnResultModel<Expression<Func<WmsInOutStockRecord, bool>>> DynamicGetQueryParams(GetWmsInOutStockRecordInput input)
- {
- //鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
- var whereConditions = WhereConditionsExtensions.GetWhereConditions<WmsInOutStockRecord, GetWmsInOutStockRecordInput>(input);
- if (!whereConditions.IsSuccess)
- {
- throw new Exception("鍔ㄦ�佹瀯閫犳煡璇㈡潯浠跺け璐�:" + whereConditions.ErrMsg);
- }
-
- //涔熷彲鍐嶆鑷畾涔夋瀯寤烘煡璇㈡潯浠�
- Expression<Func<WmsInOutStockRecord, bool>> extendExpression = a => a.IsDeleted == false;
- // 浣跨敤 System.Linq.PredicateBuilder 鐨� And
- var pres = (System.Linq.Expressions.Expression<Func<WmsInOutStockRecord, bool>>)(whereConditions.data);
- whereConditions.data = System.Linq.PredicateBuilder.And(pres, extendExpression);
-
- return whereConditions;
- }
-
- /// <summary>
- /// 鏂板缓鍑哄叆搴撹褰曡〃
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- /// <exception cref="UserFriendlyException"></exception>
- public virtual async Task<WmsInOutStockRecordDto> CreateAsync(WmsInOutStockRecordCreateDto input)
- {
- await CheckCreateOrUpdateDtoAsync(input);
-
- var exist = await wmsInOutStockRecordRepository.NameExistAsync(input.MaterialNo);
- if (exist)
- {
- throw new UserFriendlyException(L[CMSPluginDomainErrorCodes.NameAlreadyExists, input.MaterialNo]);
- }
-
- var maxSort = await wmsInOutStockRecordRepository.GetMaxSortAsync();
- var sort = input.Sort ?? maxSort;
-
- var insertObj = ObjectMapper.Map<WmsInOutStockRecordCreateDto, WmsInOutStockRecord>(input);
- insertObj.Sort = sort;
- input.MapExtraPropertiesTo(insertObj, MappingPropertyDefinitionChecks.None);
-
- await wmsInOutStockRecordRepository.InsertAsync(insertObj);
-
- if (input.Sort.HasValue && insertObj.Sort != maxSort)
- {
- await AdjustSortAsync(insertObj.Id, insertObj.Sort);
- }
-
- return ObjectMapper.Map<WmsInOutStockRecord, WmsInOutStockRecordDto>(insertObj);
- }
-
- /// <summary>
- /// 鏇存柊鍑哄叆搴撹褰曡〃
- /// </summary>
- /// <param name="id"></param>
- /// <param name="input"></param>
- /// <returns></returns>
- /// <exception cref="UserFriendlyException"></exception>
- public virtual async Task<WmsInOutStockRecordDto> UpdateAsync(Guid id, WmsInOutStockRecordUpdateDto input)
- {
- await CheckCreateOrUpdateDtoAsync(input);
-
- var updateObj = await wmsInOutStockRecordRepository.GetAsync(id);
- var exist = await wmsInOutStockRecordRepository.NameExistAsync(input.MaterialNo, updateObj.Id);
- if (exist)
- {
- throw new UserFriendlyException(L[CMSPluginDomainErrorCodes.NameAlreadyExists, input.MaterialNo]);
- }
-
- updateObj.SetConcurrencyStampIfNotNull(input.ConcurrencyStamp);
- input.MapExtraPropertiesTo(updateObj, MappingPropertyDefinitionChecks.None);
-
- updateObj.OrderNo = input.OrderNo;
- updateObj.MaterialName = input.MaterialName;
- updateObj.MaterialNo = input.MaterialNo;
- updateObj.StockType = input.StockType;
- updateObj.ContainerNo = input.ContainerNo;
- updateObj.MaterialModel = input.MaterialModel;
- updateObj.OperateTime = input.OperateTime;
- updateObj.Remark = input.Remark;
- updateObj.MaterialId = input.MaterialId;
- updateObj.TaskNo = input.TaskNo;
- updateObj.SourcePlace = input.SourcePlace;
- updateObj.ToPlace = input.ToPlace;
- updateObj.IsDisabled = input.IsDisabled;
-
-
- await wmsInOutStockRecordRepository.UpdateAsync(updateObj);
-
- return ObjectMapper.Map<WmsInOutStockRecord, WmsInOutStockRecordDto>(updateObj);
- }
-
- /// <summary>
- /// 鍏嬮殕鍑哄叆搴撹褰曡〃
- /// </summary>
- /// <param name="ids"></param>
- /// <returns></returns>
- public async Task<List<WmsInOutStockRecordDto>> CloneAsync(IEnumerable<Guid> ids)
- {
- //var wmsInOutStockRecords = new List<WmsInOutStockRecord>();
- //if (ids != null)
- //{
- // var sort = await wmsInOutStockRecordRepository.GetMaxSortAsync();
- // foreach (var id in ids)
- // {
- // var WmsInOutStockRecord = await wmsInOutStockRecordRepository.FindAsync(id);
- // if (WmsInOutStockRecord != null)
- // {
- // var name = WmsInOutStockRecord.Name + WmsInOutStockRecordConsts.CloneTag;
- // var notExist = false;
- // while (!notExist)
- // {
- // var exist = await wmsInOutStockRecordRepository.NameExistAsync(name);
- // if (exist || wmsInOutStockRecords.Any(x => x.Name == name))
- // {
- // name += WmsInOutStockRecordConsts.CloneTag;
- // continue;
- // }
-
- // notExist = true;
- // }
-
- // //WmsInOutStockRecord = await wmsInOutStockRecordRepository.InsertAsync(WmsInOutStockRecord.Clone(GuidGenerator.Create(), name, sort++));
- // wmsInOutStockRecords.Add(WmsInOutStockRecord);
- // }
- // }
- //}
-
- //return ObjectMapper.Map<List<WmsInOutStockRecord>, List<WmsInOutStockRecordDto>>(wmsInOutStockRecords);
- return new List<WmsInOutStockRecordDto>();
- }
-
- /// <summary>
- /// 鍒犻櫎鍗曚釜鍑哄叆搴撹褰曡〃
- /// </summary>
- /// <param name="id"></param>
- /// <returns></returns>
- public virtual Task DeleteAsync(Guid id)
- {
- return wmsInOutStockRecordRepository.DeleteAsync(id);
- }
-
- /// <summary>
- /// 鍒犻櫎澶氫釜鍑哄叆搴撹褰曡〃
- /// </summary>
- /// <param name="ids"></param>
- /// <returns></returns>
- public async Task DeleteManyAsync(IEnumerable<Guid> ids)
- {
- foreach (var id in ids)
- {
- await DeleteAsync(id);
- }
- }
-
- /// <summary>
- /// 璋冩暣鎺掑簭鍑哄叆搴撹褰曡〃
- /// </summary>
- /// <param name="id"></param>
- /// <param name="sort"></param>
- /// <returns></returns>
- public virtual async Task AdjustSortAsync(Guid id, int sort)
- {
- var list = await wmsInOutStockRecordRepository.GetListAsync(null, nameof(WmsInOutStockRecord.Sort));
- if (list != null && list.Any())
- {
- var initSort = 1;
- list.ForEach(x => x.AdjustSort(initSort++));
- var entity = list.FirstOrDefault(x => x.Id == id);
- if (entity != null)
- {
- if (sort == 1)
- {
- list.Where(x => x.Id != id).ToList()?.ForEach(x => x.AdjustSort(x.Sort + 1));
- }
- else if (entity.Sort > sort)
- {
- list.Where(x => x.Id != id && x.Sort >= sort).ToList()?.ForEach(x => x.AdjustSort(x.Sort + 1));
- list.Where(x => x.Id != id && x.Sort < sort).ToList()?.ForEach(x => x.AdjustSort(x.Sort - 1));
- }
- else if (entity.Sort < sort)
- {
- list.Where(x => x.Id != id && x.Sort > sort).ToList()?.ForEach(x => x.AdjustSort(x.Sort + 1));
- list.Where(x => x.Id != id && x.Sort <= sort).ToList()?.ForEach(x => x.AdjustSort(x.Sort - 1));
- }
-
- entity.AdjustSort(sort);
- }
- }
-
- await wmsInOutStockRecordRepository.UpdateManyAsync(list);
- }
-
- /// <summary>
- /// 瀵煎叆鍑哄叆搴撹褰曡〃
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- /// <exception cref="UserFriendlyException"></exception>
- public async Task ImportAsync(WmsInOutStockRecordsImportModel input)
- {
- Check.NotNull(input, nameof(input));
-
- var wmsInOutStockRecordCreateDtos = new List<(int RowIndex, WmsInOutStockRecordCreateDto Item)>();
- var wmsInOutStockRecordUpdateDtos = new List<(int RowIndex, Guid Id, WmsInOutStockRecordUpdateDto Item)>();
- var importItems = input.WmsInOutStockRecords;
-
- if (importItems != null && importItems.Any())
- {
- #region 瀵煎叆鏍￠獙
-
- // 鍒ゆ柇鍚嶇О鏄惁閲嶅锛屽苟杈撳嚭绗嚑琛岄噸澶�
- var duplicateWmsInOutStockRecords = importItems.GroupBy(x => x.MaterialNo).Where(x => x.Count() > 1).ToList();
- if (duplicateWmsInOutStockRecords?.Any() == true)
- {
- var duplicateWmsInOutStockRecordMsgs = duplicateWmsInOutStockRecords.Select(x => $"绗� {string.Join(",", x.Select(x => x.RowIndex))} 琛岋細{x.Key} 鍚嶇О閲嶅");
- var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝 {string.Join(",", duplicateWmsInOutStockRecordMsgs)}锛岀粓姝㈠鍏�";
- throw new UserFriendlyException(errorMsg);
- }
-
- #endregion
-
- foreach (var impItem in importItems)
- {
- if (impItem.MaterialNo.IsNullOrWhiteSpace() && impItem.MaterialName.IsNullOrWhiteSpace())
- {
- continue;
- }
-
- if (impItem.MaterialNo.IsNullOrWhiteSpace())
- {
- var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝绗瑊impItem.RowIndex}琛岋細WmsInOutStockRecord鍚嶇О涓嶈兘涓虹┖";
- throw new UserFriendlyException(errorMsg);
- }
-
- var oldWmsInOutStockRecord = await wmsInOutStockRecordRepository.FindByNameAsync(impItem.MaterialNo);
- if (oldWmsInOutStockRecord != null)
- {
- var wmsInOutStockRecordUpdateDto = new WmsInOutStockRecordUpdateDto
- {
- OrderNo = impItem.OrderNo,
-MaterialName = impItem.MaterialName,
-MaterialNo = impItem.MaterialNo,
-StockType = impItem.StockType,
-ContainerNo = impItem.ContainerNo,
-MaterialModel = impItem.MaterialModel,
-OperateTime = impItem.OperateTime,
-Remark = impItem.Remark,
-MaterialId = impItem.MaterialId,
-TaskNo = impItem.TaskNo,
-SourcePlace = impItem.SourcePlace,
-ToPlace = impItem.ToPlace,
-IsDisabled = impItem.IsDisabled,
-
- };
-
- wmsInOutStockRecordUpdateDtos.Add((impItem.RowIndex, oldWmsInOutStockRecord.Id, wmsInOutStockRecordUpdateDto));
- }
- else
- {
- var wmsInOutStockRecordCreateDto = new WmsInOutStockRecordCreateDto
- {
- OrderNo = impItem.OrderNo,
-MaterialName = impItem.MaterialName,
-MaterialNo = impItem.MaterialNo,
-StockType = impItem.StockType,
-ContainerNo = impItem.ContainerNo,
-MaterialModel = impItem.MaterialModel,
-OperateTime = impItem.OperateTime,
-Remark = impItem.Remark,
-MaterialId = impItem.MaterialId,
-TaskNo = impItem.TaskNo,
-SourcePlace = impItem.SourcePlace,
-ToPlace = impItem.ToPlace,
-IsDisabled = impItem.IsDisabled,
-
- };
-
- wmsInOutStockRecordCreateDtos.Add((impItem.RowIndex, wmsInOutStockRecordCreateDto));
- }
- }
- }
-
- // 鏂板
- foreach (var wmsInOutStockRecordDto in wmsInOutStockRecordCreateDtos)
- {
- try
- {
- await CreateAsync(wmsInOutStockRecordDto.Item);
- }
- catch (Exception e)
- {
- var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝绗瑊wmsInOutStockRecordDto.RowIndex}琛岋細{e.Message}锛岀粓姝㈠鍏�";
- throw new UserFriendlyException(errorMsg);
- }
- }
-
- // 鏇存柊
- foreach (var wmsInOutStockRecordDto in wmsInOutStockRecordUpdateDtos)
- {
- try
- {
- await UpdateAsync(wmsInOutStockRecordDto.Id, wmsInOutStockRecordDto.Item);
- }
- catch (Exception e)
- {
- var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝绗瑊wmsInOutStockRecordDto.RowIndex}琛岋細{e.Message}锛岀粓姝㈠鍏�";
- throw new UserFriendlyException(errorMsg);
- }
- }
- }
-
- /// <summary>
- /// 瀵煎嚭鍑哄叆搴撹褰曡〃
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- public async Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsInOutStockRecordInput input)
- {
- Check.NotNull(input, nameof(input));
-
- if (input.Sorting.IsNullOrWhiteSpace())
- {
- input.Sorting = nameof(WmsInOutStockRecord.Sort);
- }
-
- #region 鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
-
- //鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
- var whereConditions = DynamicGetQueryParams(input);
-
- #endregion
-
-
- var list = await wmsInOutStockRecordRepository.GetListAsync(whereConditions, input.Sorting, input.MaxResultCount, input.SkipCount, includeDetails: true);
- var result = ObjectMapper.Map<List<WmsInOutStockRecord>, List<WmsInOutStockRecordDto>>(list);
-
- var sheets = new Dictionary<string, object>
- {
- ["閰嶇疆"] = ExportHelper.ConvertListToExportData(result),
- };
-
- var fileName = result.Count > 1 ? "鍑哄叆搴撹褰曡〃鍒楄〃" : result.Count == 1 ? result[0]?.MaterialNo : "WmsInOutStockRecord妯＄増";
- return (sheets, fileName);
- }
-
- /// <summary>
- /// 鏍￠獙鍑哄叆搴撹褰曡〃锛屽綋鏂板缓鎴栨洿鏂版椂
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- protected Task CheckCreateOrUpdateDtoAsync(WmsInOutStockRecordCreateOrUpdateDtoBase input)
- {
- Check.NotNull(input, nameof(input));
- Check.NotNullOrWhiteSpace(input.OrderNo, "鍗曟嵁缂栧彿", 50);
- Check.NotNullOrWhiteSpace(input.MaterialNo, "鐗╂枡浠跺彿", 50);
- Check.NotNull(input.StockType, "鎿嶄綔绫诲瀷");
- Check.NotNullOrWhiteSpace(input.MaterialId, "鐗╂枡ID", 50);
- Check.NotNullOrWhiteSpace(input.TaskNo, "浠诲姟鍙�", 50);
-
- return Task.CompletedTask;
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialAppService.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialAppService.cs"
deleted file mode 100644
index 8304853..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialAppService.cs"
+++ /dev/null
@@ -1,445 +0,0 @@
-using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterial;
-using CMS.Plugin.HIAWms.Application.Contracts.Services;
-using CMS.Plugin.HIAWms.Domain.Shared;
-using CMS.Plugin.HIAWms.Domain.Shared.Util;
-using CMS.Plugin.HIAWms.Domain.Shared.WmsMaterial;
-using CMS.Plugin.HIAWms.Domain.WmsMaterial;
-using CmsQueryExtensions.Extension;
-using System.Linq.Expressions;
-using Volo.Abp;
-using Volo.Abp.Application.Dtos;
-using Volo.Abp.Data;
-using Volo.Abp.ObjectExtending;
-using Volo.Abp.ObjectMapping;
-
-namespace CMS.Plugin.HIAWms.Application.Implements;
-
-/// <summary>
-/// 鐗╂枡鍩虹淇℃伅琛ㄥ簲鐢ㄦ湇鍔�
-/// </summary>
-public class WmsMaterialAppService : CMSPluginAppService, IWmsMaterialAppService
-{
- private readonly IWmsMaterialRepository wmsmaterialsRepository;
-
- /// <summary>
- /// Initializes a new instance of the <see cref="WmsMaterialAppService"/> class.
- /// </summary>
- /// <param name="WmsMaterialRepository">The task job repository.</param>
- public WmsMaterialAppService(IWmsMaterialRepository WmsMaterialRepository)
- {
- wmsmaterialsRepository = WmsMaterialRepository;
- }
-
- /// <summary>
- /// 鑾峰彇鎸囧畾鐗╂枡鍩虹淇℃伅琛�
- /// </summary>
- /// <param name="id"></param>
- /// <returns></returns>
- public virtual async Task<WmsMaterialDto> GetAsync(Guid id)
- {
- return ObjectMapper.Map<WmsMaterial, WmsMaterialDto>(await wmsmaterialsRepository.GetAsync(id));
- }
-
- /// <summary>
- /// 鍒嗛〉鑾峰彇鐗╂枡鍩虹淇℃伅琛�
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- public virtual async Task<PagedResultDto<WmsMaterialDto>> GetListAsync(GetWmsMaterialInput input)
- {
- Check.NotNull(input, nameof(input));
-
- if (input.Sorting.IsNullOrWhiteSpace())
- {
- input.Sorting = nameof(WmsMaterial.Sort);
- }
-
- #region 鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
-
- //鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
- var whereConditions = DynamicGetQueryParams(input);
-
- #endregion
-
- var count = await wmsmaterialsRepository.GetCountAsync(whereConditions);
- var list = await wmsmaterialsRepository.GetListAsync(whereConditions, input.Sorting, input.MaxResultCount, input.SkipCount);
-
- return new PagedResultDto<WmsMaterialDto>(count, ObjectMapper.Map<List<WmsMaterial>, List<WmsMaterialDto>>(list));
- }
-
- /// <summary>
- /// 鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
- /// </summary>
- /// <param name="input">杈撳叆鍙傛暟</param>
- /// <returns></returns>
- private FunReturnResultModel<Expression<Func<WmsMaterial, bool>>> DynamicGetQueryParams(GetWmsMaterialInput input)
- {
- //鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
- var whereConditions = WhereConditionsExtensions.GetWhereConditions<WmsMaterial, GetWmsMaterialInput>(input);
- if (!whereConditions.IsSuccess)
- {
- throw new Exception("鍔ㄦ�佹瀯閫犳煡璇㈡潯浠跺け璐�:" + whereConditions.ErrMsg);
- }
-
- //涔熷彲鍐嶆鑷畾涔夋瀯寤烘煡璇㈡潯浠�
- Expression<Func<WmsMaterial, bool>> extendExpression = a => a.IsDeleted == false;
- // 浣跨敤 System.Linq.PredicateBuilder 鐨� And
- var pres = (System.Linq.Expressions.Expression<Func<WmsMaterial, bool>>)(whereConditions.data);
- whereConditions.data = System.Linq.PredicateBuilder.And(pres, extendExpression);
-
- return whereConditions;
- }
-
- /// <summary>
- /// 鏂板缓鐗╂枡鍩虹淇℃伅琛�
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- /// <exception cref="UserFriendlyException"></exception>
- public virtual async Task<WmsMaterialDto> CreateAsync(WmsMaterialCreateDto input)
- {
- await CheckCreateOrUpdateDtoAsync(input);
-
- var exist = await wmsmaterialsRepository.NameExistAsync(input.MaterialCode);
- if (exist)
- {
- throw new UserFriendlyException(L[CMSPluginDomainErrorCodes.NameAlreadyExists, input.MaterialCode]);
- }
-
- var maxSort = await wmsmaterialsRepository.GetMaxSortAsync();
- var sort = input.Sort ?? maxSort;
-
- var insertObj = ObjectMapper.Map<WmsMaterialCreateDto, WmsMaterial>(input);
- insertObj.Sort = sort;
- input.MapExtraPropertiesTo(insertObj, MappingPropertyDefinitionChecks.None);
-
- await wmsmaterialsRepository.InsertAsync(insertObj);
-
- if (input.Sort.HasValue && insertObj.Sort != maxSort)
- {
- await AdjustSortAsync(insertObj.Id, insertObj.Sort);
- }
-
- return ObjectMapper.Map<WmsMaterial, WmsMaterialDto>(insertObj);
- }
-
- /// <summary>
- /// 鏇存柊鐗╂枡鍩虹淇℃伅琛�
- /// </summary>
- /// <param name="id"></param>
- /// <param name="input"></param>
- /// <returns></returns>
- /// <exception cref="UserFriendlyException"></exception>
- public virtual async Task<WmsMaterialDto> UpdateAsync(Guid id, WmsMaterialUpdateDto input)
- {
- await CheckCreateOrUpdateDtoAsync(input);
-
- var updateObj = await wmsmaterialsRepository.GetAsync(id);
- var exist = await wmsmaterialsRepository.NameExistAsync(input.MaterialCode, updateObj.Id);
- if (exist)
- {
- throw new UserFriendlyException(L[CMSPluginDomainErrorCodes.NameAlreadyExists, input.MaterialCode]);
- }
-
- updateObj.SetConcurrencyStampIfNotNull(input.ConcurrencyStamp);
- input.MapExtraPropertiesTo(updateObj, MappingPropertyDefinitionChecks.None);
-
- updateObj.MaterialCode = input.MaterialCode;
- updateObj.MaterialName = input.MaterialName;
- updateObj.PurchaseType = input.PurchaseType;
- updateObj.MaterialType = input.MaterialType;
- updateObj.PrimaryUnit = input.PrimaryUnit;
- updateObj.Standard = input.Standard;
- updateObj.OuterDiameter = input.OuterDiameter;
- updateObj.WallThickness = input.WallThickness;
- updateObj.MaterialQuality = input.MaterialQuality;
- updateObj.Length = input.Length;
- updateObj.IsMainBranch = input.IsMainBranch;
- updateObj.Factory = input.Factory;
- updateObj.Certification = input.Certification;
- updateObj.RedundantField1 = input.RedundantField1;
- updateObj.RedundantField2 = input.RedundantField2;
- updateObj.RedundantField3 = input.RedundantField3;
- updateObj.Remark = input.Remark;
- updateObj.IsDisabled = input.IsDisabled;
-
-
- await wmsmaterialsRepository.UpdateAsync(updateObj);
-
- return ObjectMapper.Map<WmsMaterial, WmsMaterialDto>(updateObj);
- }
-
- /// <summary>
- /// 鍏嬮殕鐗╂枡鍩虹淇℃伅琛�
- /// </summary>
- /// <param name="ids"></param>
- /// <returns></returns>
- public async Task<List<WmsMaterialDto>> CloneAsync(IEnumerable<Guid> ids)
- {
- //var wmsmaterialss = new List<WmsMaterial>();
- //if (ids != null)
- //{
- // var sort = await wmsmaterialsRepository.GetMaxSortAsync();
- // foreach (var id in ids)
- // {
- // var WmsMaterial = await wmsmaterialsRepository.FindAsync(id);
- // if (WmsMaterial != null)
- // {
- // var name = WmsMaterial.Name + WmsMaterialConsts.CloneTag;
- // var notExist = false;
- // while (!notExist)
- // {
- // var exist = await wmsmaterialsRepository.NameExistAsync(name);
- // if (exist || wmsmaterialss.Any(x => x.Name == name))
- // {
- // name += WmsMaterialConsts.CloneTag;
- // continue;
- // }
-
- // notExist = true;
- // }
-
- // //WmsMaterial = await wmsmaterialsRepository.InsertAsync(WmsMaterial.Clone(GuidGenerator.Create(), name, sort++));
- // wmsmaterialss.Add(WmsMaterial);
- // }
- // }
- //}
-
- //return ObjectMapper.Map<List<WmsMaterial>, List<WmsMaterialDto>>(wmsmaterialss);
- return new List<WmsMaterialDto>();
- }
-
- /// <summary>
- /// 鍒犻櫎鍗曚釜鐗╂枡鍩虹淇℃伅琛�
- /// </summary>
- /// <param name="id"></param>
- /// <returns></returns>
- public virtual Task DeleteAsync(Guid id)
- {
- return wmsmaterialsRepository.DeleteAsync(id);
- }
-
- /// <summary>
- /// 鍒犻櫎澶氫釜鐗╂枡鍩虹淇℃伅琛�
- /// </summary>
- /// <param name="ids"></param>
- /// <returns></returns>
- public async Task DeleteManyAsync(IEnumerable<Guid> ids)
- {
- foreach (var id in ids)
- {
- await DeleteAsync(id);
- }
- }
-
- /// <summary>
- /// 璋冩暣鎺掑簭鐗╂枡鍩虹淇℃伅琛�
- /// </summary>
- /// <param name="id"></param>
- /// <param name="sort"></param>
- /// <returns></returns>
- public virtual async Task AdjustSortAsync(Guid id, int sort)
- {
- var list = await wmsmaterialsRepository.GetListAsync(null, nameof(WmsMaterial.Sort));
- if (list != null && list.Any())
- {
- var initSort = 1;
- list.ForEach(x => x.AdjustSort(initSort++));
- var entity = list.FirstOrDefault(x => x.Id == id);
- if (entity != null)
- {
- if (sort == 1)
- {
- list.Where(x => x.Id != id).ToList()?.ForEach(x => x.AdjustSort(x.Sort + 1));
- }
- else if (entity.Sort > sort)
- {
- list.Where(x => x.Id != id && x.Sort >= sort).ToList()?.ForEach(x => x.AdjustSort(x.Sort + 1));
- list.Where(x => x.Id != id && x.Sort < sort).ToList()?.ForEach(x => x.AdjustSort(x.Sort - 1));
- }
- else if (entity.Sort < sort)
- {
- list.Where(x => x.Id != id && x.Sort > sort).ToList()?.ForEach(x => x.AdjustSort(x.Sort + 1));
- list.Where(x => x.Id != id && x.Sort <= sort).ToList()?.ForEach(x => x.AdjustSort(x.Sort - 1));
- }
-
- entity.AdjustSort(sort);
- }
- }
-
- await wmsmaterialsRepository.UpdateManyAsync(list);
- }
-
- /// <summary>
- /// 瀵煎叆鐗╂枡鍩虹淇℃伅琛�
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- /// <exception cref="UserFriendlyException"></exception>
- public async Task ImportAsync(WmsMaterialsImportModel input)
- {
- Check.NotNull(input, nameof(input));
-
- var wmsmaterialsCreateDtos = new List<(int RowIndex, WmsMaterialCreateDto Item)>();
- var wmsmaterialsUpdateDtos = new List<(int RowIndex, Guid Id, WmsMaterialUpdateDto Item)>();
- var importItems = input.WmsMaterials;
-
- if (importItems != null && importItems.Any())
- {
- #region 瀵煎叆鏍￠獙
-
- // 鍒ゆ柇鍚嶇О鏄惁閲嶅锛屽苟杈撳嚭绗嚑琛岄噸澶�
- var duplicateWmsMaterials = importItems.GroupBy(x => x.MaterialCode).Where(x => x.Count() > 1).ToList();
- if (duplicateWmsMaterials?.Any() == true)
- {
- var duplicateWmsMaterialMsgs = duplicateWmsMaterials.Select(x => $"绗� {string.Join(",", x.Select(x => x.RowIndex))} 琛岋細{x.Key} 鍚嶇О閲嶅");
- var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝 {string.Join(",", duplicateWmsMaterialMsgs)}锛岀粓姝㈠鍏�";
- throw new UserFriendlyException(errorMsg);
- }
-
- #endregion
-
- foreach (var impItem in importItems)
- {
- if (impItem.MaterialCode.IsNullOrWhiteSpace() && impItem.MaterialName.IsNullOrWhiteSpace())
- {
- continue;
- }
-
- if (impItem.MaterialCode.IsNullOrWhiteSpace())
- {
- var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝绗瑊impItem.RowIndex}琛岋細WmsMaterial鍚嶇О涓嶈兘涓虹┖";
- throw new UserFriendlyException(errorMsg);
- }
-
- var oldWmsMaterial = await wmsmaterialsRepository.FindByNameAsync(impItem.MaterialCode);
- if (oldWmsMaterial != null)
- {
- var wmsmaterialsUpdateDto = new WmsMaterialUpdateDto
- {
- MaterialCode = impItem.MaterialCode,
- MaterialName = impItem.MaterialName,
- PurchaseType = impItem.PurchaseType,
- MaterialType = impItem.MaterialType,
- PrimaryUnit = impItem.PrimaryUnit,
- Standard = impItem.Standard,
- OuterDiameter = impItem.OuterDiameter,
- WallThickness = impItem.WallThickness,
- MaterialQuality = impItem.MaterialQuality,
- Length = impItem.Length,
- IsMainBranch = impItem.IsMainBranch,
- Factory = impItem.Factory,
- Certification = impItem.Certification,
- Remark = impItem.Remark,
- };
-
- wmsmaterialsUpdateDtos.Add((impItem.RowIndex, oldWmsMaterial.Id, wmsmaterialsUpdateDto));
- }
- else
- {
- var wmsmaterialsCreateDto = new WmsMaterialCreateDto
- {
- MaterialCode = impItem.MaterialCode,
- MaterialName = impItem.MaterialName,
- PurchaseType = impItem.PurchaseType,
- MaterialType = impItem.MaterialType,
- PrimaryUnit = impItem.PrimaryUnit,
- Standard = impItem.Standard,
- OuterDiameter = impItem.OuterDiameter,
- WallThickness = impItem.WallThickness,
- MaterialQuality = impItem.MaterialQuality,
- Length = impItem.Length,
- IsMainBranch = impItem.IsMainBranch,
- Factory = impItem.Factory,
- Certification = impItem.Certification,
- Remark = impItem.Remark,
- };
-
- wmsmaterialsCreateDtos.Add((impItem.RowIndex, wmsmaterialsCreateDto));
- }
- }
- }
-
- // 鏂板
- foreach (var wmsmaterialsDto in wmsmaterialsCreateDtos)
- {
- try
- {
- await CreateAsync(wmsmaterialsDto.Item);
- }
- catch (Exception e)
- {
- var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝绗瑊wmsmaterialsDto.RowIndex}琛岋細{e.Message}锛岀粓姝㈠鍏�";
- throw new UserFriendlyException(errorMsg);
- }
- }
-
- // 鏇存柊
- foreach (var wmsmaterialsDto in wmsmaterialsUpdateDtos)
- {
- try
- {
- await UpdateAsync(wmsmaterialsDto.Id, wmsmaterialsDto.Item);
- }
- catch (Exception e)
- {
- var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝绗瑊wmsmaterialsDto.RowIndex}琛岋細{e.Message}锛岀粓姝㈠鍏�";
- throw new UserFriendlyException(errorMsg);
- }
- }
- }
-
- /// <summary>
- /// 瀵煎嚭鐗╂枡鍩虹淇℃伅琛�
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- public async Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsMaterialInput input)
- {
- Check.NotNull(input, nameof(input));
-
- if (input.Sorting.IsNullOrWhiteSpace())
- {
- input.Sorting = nameof(WmsMaterial.Sort);
- }
-
- #region 鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
-
- //鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
- var whereConditions = DynamicGetQueryParams(input);
-
- #endregion
-
-
- var list = await wmsmaterialsRepository.GetListAsync(whereConditions, input.Sorting, input.MaxResultCount, input.SkipCount, includeDetails: true);
- var result = ObjectMapper.Map<List<WmsMaterial>, List<WmsMaterialDto>>(list);
-
- var sheets = new Dictionary<string, object>
- {
- ["閰嶇疆"] = ExportHelper.ConvertListToExportData(result),
- };
-
- var fileName = result.Count > 1 ? "WmsMaterial鍒楄〃" : result.Count == 1 ? result[0]?.MaterialCode : "WmsMaterial妯＄増";
- return (sheets, fileName);
- }
-
- /// <summary>
- /// 鏍￠獙鐗╂枡鍩虹淇℃伅琛紝褰撴柊寤烘垨鏇存柊鏃�
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- protected Task CheckCreateOrUpdateDtoAsync(WmsMaterialCreateOrUpdateDtoBase input)
- {
- Check.NotNull(input, nameof(input));
- Check.NotNullOrWhiteSpace(input.MaterialCode, "鐗╂枡缂栫爜锛堝敮涓�鏍囪瘑锛�", 64);
- Check.NotNullOrWhiteSpace(input.MaterialName, "鐗╂枡鍚嶇О", 128);
- Check.NotNull(input.PurchaseType, "閲囪喘绫诲瀷锛堟灇涓惧�硷級");
- Check.NotNull(input.MaterialType, "鐗╂枡绫诲瀷锛堟灇涓惧�硷級");
- Check.NotNull(input.OuterDiameter, "澶栧緞锛堝崟浣嶏細mm锛�");
- Check.NotNull(input.WallThickness, "澹佸帤锛堝崟浣嶏細mm锛�");
- Check.NotNull(input.Length, "闀垮害锛堝崟浣嶏細m锛�");
- Check.NotNull(input.IsMainBranch, "鏄惁涓轰富鏀");
-
- return Task.CompletedTask;
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application/Implements/WmsPlaceAppService.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application/Implements/WmsPlaceAppService.cs"
deleted file mode 100644
index 8d3b362..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application/Implements/WmsPlaceAppService.cs"
+++ /dev/null
@@ -1,322 +0,0 @@
-using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlaces;
-using CMS.Plugin.HIAWms.Application.Contracts.Services;
-using CMS.Plugin.HIAWms.Domain.WmsPlaces;
-using CMS.Plugin.HIAWms.Domain.Shared;
-using CMS.Plugin.HIAWms.Domain.Shared.WmsPlaces;
-using Volo.Abp;
-using Volo.Abp.Application.Dtos;
-using Volo.Abp.Data;
-using Volo.Abp.ObjectExtending;
-using CMS.Plugin.HIAWms.Domain.Shared.Util;
-
-namespace CMS.Plugin.HIAWms.Application.Implements;
-
-/// <inheritdoc />
-public class WmsPlaceAppService : CMSPluginAppService, IWmsPlaceAppService
-{
- private readonly IWmsPlaceRepository _wmsplaceRepository;
-
- /// <summary>
- /// Initializes a new instance of the <see cref="WmsPlaceAppService"/> class.
- /// </summary>
- /// <param name="wmsplaceRepository">The task job repository.</param>
- public WmsPlaceAppService(IWmsPlaceRepository wmsplaceRepository)
- {
- _wmsplaceRepository = wmsplaceRepository;
- }
-
- /// <inheritdoc />
- public virtual async Task<WmsPlaceDto> GetAsync(Guid id)
- {
- return ObjectMapper.Map<WmsPlace, WmsPlaceDto>(await _wmsplaceRepository.GetAsync(id));
- }
-
- /// <inheritdoc />
- public virtual async Task<PagedResultDto<WmsPlaceDto>> GetListAsync(GetWmsPlacesInput input)
- {
- Check.NotNull(input, nameof(input));
-
- if (input.Sorting.IsNullOrWhiteSpace())
- {
- input.Sorting = nameof(WmsPlace.Sort);
- }
-
- var specification = new WmsPlaceSpecification(input.Name);
- var place = ObjectMapper.Map<GetWmsPlacesInput, WmsPlace>(input);
- var count = await _wmsplaceRepository.GetCountAsync(place,input.Filter, specification);
- var list = await _wmsplaceRepository.GetListAsync(place, input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter, specification);
-
- return new PagedResultDto<WmsPlaceDto>(count, ObjectMapper.Map<List<WmsPlace>, List<WmsPlaceDto>>(list));
- }
-
- /// <inheritdoc />
- public virtual async Task<WmsPlaceDto> CreateAsync(WmsPlaceCreateDto input)
- {
- await CheckCreateOrUpdateDtoAsync(input);
-
- var exist = await _wmsplaceRepository.NameExistAsync(input.PlaceNo);
- if (exist)
- {
- throw new UserFriendlyException(L[CMSPluginDomainErrorCodes.NameAlreadyExists, input.PlaceNo]);
- }
-
- var maxSort = await _wmsplaceRepository.GetMaxSortAsync();
- var sort = input.Sort ?? maxSort;
- var wmsplace = ObjectMapper.Map<WmsPlaceCreateDto,WmsPlace>(input);
- input.MapExtraPropertiesTo(wmsplace, MappingPropertyDefinitionChecks.None);
- wmsplace.Sort = sort;
- await _wmsplaceRepository.InsertAsync(wmsplace);
-
- if (input.Sort.HasValue && wmsplace.Sort != maxSort)
- {
- await AdjustSortAsync(wmsplace.Id, wmsplace.Sort);
- }
-
- return ObjectMapper.Map<WmsPlace, WmsPlaceDto>(wmsplace);
- }
-
- /// <inheritdoc />
- public virtual async Task<WmsPlaceDto> UpdateAsync(Guid id, WmsPlaceUpdateDto input)
- {
- await CheckCreateOrUpdateDtoAsync(input);
-
- var wmsplace = await _wmsplaceRepository.GetAsync(id);
- var exist = await _wmsplaceRepository.NameExistAsync(input.PlaceNo, wmsplace.Id);
- if (exist)
- {
- throw new UserFriendlyException(L[CMSPluginDomainErrorCodes.NameAlreadyExists, input.PlaceNo]);
- }
-
- wmsplace.SetConcurrencyStampIfNotNull(input.ConcurrencyStamp);
- input.MapExtraPropertiesTo(wmsplace, MappingPropertyDefinitionChecks.None);
-
- wmsplace.StorageTypeNo = input.StorageTypeNo;
- wmsplace.PlaceStatus = input.PlaceStatus;
- wmsplace.AreaCode = input.AreaCode;
- wmsplace.Aisle = input.Aisle;
- wmsplace.RowNo = input.RowNo;
- wmsplace.ColumnNo = input.ColumnNo;
- wmsplace.LayerNo = input.LayerNo;
- wmsplace.Islock = input.Islock;
- wmsplace.EmptyContainer = input.EmptyContainer;
- wmsplace.RedundantField1 = input.RedundantField1;
- wmsplace.RedundantField2 = input.RedundantField2;
- wmsplace.RedundantField3 = input.RedundantField3;
- wmsplace.Remark = input.Remark;
-
- await _wmsplaceRepository.UpdateAsync(wmsplace);
-
- return ObjectMapper.Map<WmsPlace, WmsPlaceDto>(wmsplace);
- }
-
- /// <inheritdoc />
- public async Task<List<WmsPlaceDto>> CloneAsync(IEnumerable<Guid> ids)
- {
- var wmsplaces = new List<WmsPlace>();
- if (ids != null)
- {
- var sort = await _wmsplaceRepository.GetMaxSortAsync();
- foreach (var id in ids)
- {
- var wmsplace = await _wmsplaceRepository.FindAsync(id);
- if (wmsplace != null)
- {
- var name = wmsplace.PlaceNo + WmsPlaceConsts.CloneTag;
- var notExist = false;
- while (!notExist)
- {
- var exist = await _wmsplaceRepository.NameExistAsync(name);
- if (exist || wmsplaces.Any(x => x.PlaceNo == name))
- {
- name += WmsPlaceConsts.CloneTag;
- continue;
- }
-
- notExist = true;
- }
-
- //wmsplace = await _wmsplaceRepository.InsertAsync(wmsplace.Clone(GuidGenerator.Create(), name, sort++));
- wmsplaces.Add(wmsplace);
- }
- }
- }
-
- return ObjectMapper.Map<List<WmsPlace>, List<WmsPlaceDto>>(wmsplaces);
- }
-
- /// <inheritdoc />
- public virtual Task DeleteAsync(Guid id)
- {
- return _wmsplaceRepository.DeleteAsync(id);
- }
-
- /// <inheritdoc />
- public async Task DeleteManyAsync(IEnumerable<Guid> ids)
- {
- foreach (var id in ids)
- {
- await DeleteAsync(id);
- }
- }
-
- /// <inheritdoc />
- public virtual async Task AdjustSortAsync(Guid id, int sort)
- {
- var list = await _wmsplaceRepository.GetListAsync(null,nameof(WmsPlace.Sort));
- if (list != null && list.Any())
- {
- var initSort = 1;
- list.ForEach(x => x.AdjustSort(initSort++));
- var entity = list.FirstOrDefault(x => x.Id == id);
- if (entity != null)
- {
- if (sort == 1)
- {
- list.Where(x => x.Id != id).ToList()?.ForEach(x => x.AdjustSort(x.Sort + 1));
- }
- else if (entity.Sort > sort)
- {
- list.Where(x => x.Id != id && x.Sort >= sort).ToList()?.ForEach(x => x.AdjustSort(x.Sort + 1));
- list.Where(x => x.Id != id && x.Sort < sort).ToList()?.ForEach(x => x.AdjustSort(x.Sort - 1));
- }
- else if (entity.Sort < sort)
- {
- list.Where(x => x.Id != id && x.Sort > sort).ToList()?.ForEach(x => x.AdjustSort(x.Sort + 1));
- list.Where(x => x.Id != id && x.Sort <= sort).ToList()?.ForEach(x => x.AdjustSort(x.Sort - 1));
- }
-
- entity.AdjustSort(sort);
- }
- }
-
- await _wmsplaceRepository.UpdateManyAsync(list);
- }
-
- /// <inheritdoc />
- public async Task ImportAsync(WmsPlacesImportModel input)
- {
- Check.NotNull(input, nameof(input));
-
- var wmsplaceCreateDtos = new List<(int RowIndex, WmsPlaceCreateDto Item)>();
- var wmsplaceUpdateDtos = new List<(int RowIndex, Guid Id, WmsPlaceUpdateDto Item)>();
- var wmsplaces = input.WmsPlaces;
-
- if (wmsplaces != null && wmsplaces.Any())
- {
- #region 瀵煎叆鏍￠獙
-
- // 鍒ゆ柇鍚嶇О鏄惁閲嶅锛屽苟杈撳嚭绗嚑琛岄噸澶�
- var duplicateWmsPlaces = wmsplaces.GroupBy(x => x.PlaceNo).Where(x => x.Count() > 1).ToList();
- if (duplicateWmsPlaces?.Any() == true)
- {
- var duplicateWmsPlaceMsgs = duplicateWmsPlaces.Select(x => $"绗� {string.Join(",", x.Select(x => x.RowIndex))} 琛岋細{x.Key} 鍚嶇О閲嶅");
- var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝 {string.Join(",", duplicateWmsPlaceMsgs)}锛岀粓姝㈠鍏�";
- throw new UserFriendlyException(errorMsg);
- }
-
- #endregion
-
- foreach (var wmsplace in wmsplaces)
- {
- if (wmsplace.PlaceNo.IsNullOrWhiteSpace())
- {
- continue;
- }
-
- if (wmsplace.PlaceNo.IsNullOrWhiteSpace())
- {
- var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝绗瑊wmsplace.RowIndex}琛岋細WmsPlace鍚嶇О涓嶈兘涓虹┖";
- throw new UserFriendlyException(errorMsg);
- }
-
- var oldWmsPlace = await _wmsplaceRepository.FindByNameAsync(wmsplace.PlaceNo);
- if (oldWmsPlace != null)
- {
- var wmsplaceUpdateDto = new WmsPlaceUpdateDto
- {
- PlaceNo = wmsplace.PlaceNo,
- PlaceStatus = wmsplace.PlaceStatus,
- Remark = wmsplace.Remark,
- };
-
- wmsplaceUpdateDtos.Add((wmsplace.RowIndex, oldWmsPlace.Id, wmsplaceUpdateDto));
- }
- else
- {
- var wmsplaceCreateDto = new WmsPlaceCreateDto
- {
- PlaceNo = wmsplace.PlaceNo,
- PlaceStatus = wmsplace.PlaceStatus,
- Remark = wmsplace.Remark,
- };
-
- wmsplaceCreateDtos.Add((wmsplace.RowIndex, wmsplaceCreateDto));
- }
- }
- }
-
- // 鏂板
- foreach (var wmsplaceDto in wmsplaceCreateDtos)
- {
- try
- {
- await CreateAsync(wmsplaceDto.Item);
- }
- catch (Exception e)
- {
- var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝绗瑊wmsplaceDto.RowIndex}琛岋細{e.Message}锛岀粓姝㈠鍏�";
- throw new UserFriendlyException(errorMsg);
- }
- }
-
- // 鏇存柊
- foreach (var wmsplaceDto in wmsplaceUpdateDtos)
- {
- try
- {
- await UpdateAsync(wmsplaceDto.Id, wmsplaceDto.Item);
- }
- catch (Exception e)
- {
- var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝绗瑊wmsplaceDto.RowIndex}琛岋細{e.Message}锛岀粓姝㈠鍏�";
- throw new UserFriendlyException(errorMsg);
- }
- }
- }
-
- /// <inheritdoc />
- public async Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsPlacesInput input)
- {
- Check.NotNull(input, nameof(input));
-
- if (input.Sorting.IsNullOrWhiteSpace())
- {
- input.Sorting = nameof(WmsPlace.Sort);
- }
-
- var specification = new WmsPlaceSpecification(input.Name);
- var place = ObjectMapper.Map<GetWmsPlacesInput, WmsPlace>(input);
- var list = await _wmsplaceRepository.GetListAsync(place, input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter, specification, includeDetails: true);
- var result = ObjectMapper.Map<List<WmsPlace>, List<WmsPlaceDto>>(list);
-
- var sheets = new Dictionary<string, object>
- {
- ["閰嶇疆"] = ExportHelper.ConvertListToExportData(result),
- };
-
- var fileName = result.Count > 1 ? "WmsPlace鍒楄〃" : result.Count == 1 ? result.First()?.PlaceNo : "WmsPlace妯＄増";
- return (sheets, fileName);
- }
-
- /// <summary>
- /// Checks the create or update dto asynchronous.
- /// </summary>
- /// <param name="input">The input.</param>
- protected Task CheckCreateOrUpdateDtoAsync(WmsPlaceCreateOrUpdateDtoBase input)
- {
- Check.NotNull(input, nameof(input));
- Check.NotNullOrWhiteSpace(input.PlaceNo, "缂栧彿", WmsPlaceConsts.MaxCodeLength);
- Check.Length(input.Remark, "澶囨敞", WmsPlaceConsts.MaxRemarkLength);
- return Task.CompletedTask;
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application/Implements/WmsStoreAppService.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application/Implements/WmsStoreAppService.cs"
deleted file mode 100644
index 522c3b5..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application/Implements/WmsStoreAppService.cs"
+++ /dev/null
@@ -1,313 +0,0 @@
-using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStores;
-using CMS.Plugin.HIAWms.Application.Contracts.Services;
-using CMS.Plugin.HIAWms.Domain.WmsStores;
-using CMS.Plugin.HIAWms.Domain.Shared;
-using CMS.Plugin.HIAWms.Domain.Shared.WmsStores;
-using Volo.Abp;
-using Volo.Abp.Application.Dtos;
-using Volo.Abp.Data;
-using Volo.Abp.ObjectExtending;
-using CMS.Plugin.HIAWms.Domain.Shared.Util;
-
-namespace CMS.Plugin.HIAWms.Application.Implements;
-
-/// <inheritdoc />
-public class WmsStoreAppService : CMSPluginAppService, IWmsStoreAppService
-{
- private readonly IWmsStoreRepository _wmsstoreRepository;
-
- /// <summary>
- /// Initializes a new instance of the <see cref="WmsStoreAppService"/> class.
- /// </summary>
- /// <param name="wmsstoreRepository">The task job repository.</param>
- public WmsStoreAppService(IWmsStoreRepository wmsstoreRepository)
- {
- _wmsstoreRepository = wmsstoreRepository;
- }
-
- /// <inheritdoc />
- public virtual async Task<WmsStoreDto> GetAsync(Guid id)
- {
- return ObjectMapper.Map<WmsStore, WmsStoreDto>(await _wmsstoreRepository.GetAsync(id));
- }
-
- /// <inheritdoc />
- public virtual async Task<PagedResultDto<WmsStoreDto>> GetListAsync(GetWmsStoresInput input)
- {
- Check.NotNull(input, nameof(input));
-
- if (input.Sorting.IsNullOrWhiteSpace())
- {
- input.Sorting = nameof(WmsStore.Sort);
- }
-
- var specification = new WmsStoreSpecification(input.Name);
- var store = ObjectMapper.Map<GetWmsStoresInput, WmsStore>(input);
- var count = await _wmsstoreRepository.GetCountAsync(store,input.Filter, specification);
- var list = await _wmsstoreRepository.GetListAsync(store,input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter, specification);
-
- return new PagedResultDto<WmsStoreDto>(count, ObjectMapper.Map<List<WmsStore>, List<WmsStoreDto>>(list));
- }
-
- /// <inheritdoc />
- public virtual async Task<WmsStoreDto> CreateAsync(WmsStoreCreateDto input)
- {
- await CheckCreateOrUpdateDtoAsync(input);
-
- var exist = await _wmsstoreRepository.NameExistAsync(input.StoreCode);
- if (exist)
- {
- throw new UserFriendlyException(L[CMSPluginDomainErrorCodes.NameAlreadyExists, input.StoreCode]);
- }
-
- var maxSort = await _wmsstoreRepository.GetMaxSortAsync();
- var sort = input.Sort ?? maxSort;
- var wmsstore = ObjectMapper.Map<WmsStoreCreateDto,WmsStore>(input);
- wmsstore.Sort = sort;
- input.MapExtraPropertiesTo(wmsstore, MappingPropertyDefinitionChecks.None);
-
- await _wmsstoreRepository.InsertAsync(wmsstore);
-
- if (input.Sort.HasValue && wmsstore.Sort != maxSort)
- {
- await AdjustSortAsync(wmsstore.Id, wmsstore.Sort);
- }
-
- return ObjectMapper.Map<WmsStore, WmsStoreDto>(wmsstore);
- }
-
- /// <inheritdoc />
- public virtual async Task<WmsStoreDto> UpdateAsync(Guid id, WmsStoreUpdateDto input)
- {
- await CheckCreateOrUpdateDtoAsync(input);
-
- var wmsstore = await _wmsstoreRepository.GetAsync(id);
- var exist = await _wmsstoreRepository.NameExistAsync(input.StoreCode, wmsstore.Id);
- if (exist)
- {
- throw new UserFriendlyException(L[CMSPluginDomainErrorCodes.NameAlreadyExists, input.StoreCode]);
- }
-
- wmsstore.SetConcurrencyStampIfNotNull(input.ConcurrencyStamp);
- input.MapExtraPropertiesTo(wmsstore, MappingPropertyDefinitionChecks.None);
-
- wmsstore.StoreName = input.StoreName;
- wmsstore.Remark = input.Remark;
-
- await _wmsstoreRepository.UpdateAsync(wmsstore);
-
- return ObjectMapper.Map<WmsStore, WmsStoreDto>(wmsstore);
- }
-
- /// <inheritdoc />
- public async Task<List<WmsStoreDto>> CloneAsync(IEnumerable<Guid> ids)
- {
- var wmsstores = new List<WmsStore>();
- if (ids != null)
- {
- var sort = await _wmsstoreRepository.GetMaxSortAsync();
- foreach (var id in ids)
- {
- var wmsstore = await _wmsstoreRepository.FindAsync(id);
- if (wmsstore != null)
- {
- var name = wmsstore.StoreName + WmsStoreConsts.CloneTag;
- var notExist = false;
- while (!notExist)
- {
- var exist = await _wmsstoreRepository.NameExistAsync(name);
- if (exist || wmsstores.Any(x => x.StoreCode == name))
- {
- name += WmsStoreConsts.CloneTag;
- continue;
- }
-
- notExist = true;
- }
-
- //wmsstore = await _wmsstoreRepository.InsertAsync(wmsstore.Clone(GuidGenerator.Create(), name, sort++));
- wmsstores.Add(wmsstore);
- }
- }
- }
-
- return ObjectMapper.Map<List<WmsStore>, List<WmsStoreDto>>(wmsstores);
- }
-
- /// <inheritdoc />
- public virtual Task DeleteAsync(Guid id)
- {
- return _wmsstoreRepository.DeleteAsync(id);
- }
-
- /// <inheritdoc />
- public async Task DeleteManyAsync(IEnumerable<Guid> ids)
- {
- foreach (var id in ids)
- {
- await DeleteAsync(id);
- }
- }
-
- /// <inheritdoc />
- public virtual async Task AdjustSortAsync(Guid id, int sort)
- {
- var list = await _wmsstoreRepository.GetListAsync(null,nameof(WmsStore.Sort));
- if (list != null && list.Any())
- {
- var initSort = 1;
- list.ForEach(x => x.AdjustSort(initSort++));
- var entity = list.FirstOrDefault(x => x.Id == id);
- if (entity != null)
- {
- if (sort == 1)
- {
- list.Where(x => x.Id != id).ToList()?.ForEach(x => x.AdjustSort(x.Sort + 1));
- }
- else if (entity.Sort > sort)
- {
- list.Where(x => x.Id != id && x.Sort >= sort).ToList()?.ForEach(x => x.AdjustSort(x.Sort + 1));
- list.Where(x => x.Id != id && x.Sort < sort).ToList()?.ForEach(x => x.AdjustSort(x.Sort - 1));
- }
- else if (entity.Sort < sort)
- {
- list.Where(x => x.Id != id && x.Sort > sort).ToList()?.ForEach(x => x.AdjustSort(x.Sort + 1));
- list.Where(x => x.Id != id && x.Sort <= sort).ToList()?.ForEach(x => x.AdjustSort(x.Sort - 1));
- }
-
- entity.AdjustSort(sort);
- }
- }
-
- await _wmsstoreRepository.UpdateManyAsync(list);
- }
-
- /// <inheritdoc />
- public async Task ImportAsync(WmsStoresImportModel input)
- {
- Check.NotNull(input, nameof(input));
-
- var wmsstoreCreateDtos = new List<(int RowIndex, WmsStoreCreateDto Item)>();
- var wmsstoreUpdateDtos = new List<(int RowIndex, Guid Id, WmsStoreUpdateDto Item)>();
- var wmsstores = input.WmsStores;
-
- if (wmsstores != null && wmsstores.Any())
- {
- #region 瀵煎叆鏍￠獙
-
- // 鍒ゆ柇鍚嶇О鏄惁閲嶅锛屽苟杈撳嚭绗嚑琛岄噸澶�
- var duplicateWmsStores = wmsstores.GroupBy(x => x.StoreCode).Where(x => x.Count() > 1).ToList();
- if (duplicateWmsStores?.Any() == true)
- {
- var duplicateWmsStoreMsgs = duplicateWmsStores.Select(x => $"绗� {string.Join(",", x.Select(x => x.RowIndex))} 琛岋細{x.Key} 鍚嶇О閲嶅");
- var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝 {string.Join(",", duplicateWmsStoreMsgs)}锛岀粓姝㈠鍏�";
- throw new UserFriendlyException(errorMsg);
- }
-
- #endregion
-
- foreach (var wmsstore in wmsstores)
- {
- if (wmsstore.StoreCode.IsNullOrWhiteSpace() && wmsstore.StoreName.IsNullOrWhiteSpace())
- {
- continue;
- }
-
- if (wmsstore.StoreCode.IsNullOrWhiteSpace())
- {
- var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝绗瑊wmsstore.RowIndex}琛岋細WmsStore鍚嶇О涓嶈兘涓虹┖";
- throw new UserFriendlyException(errorMsg);
- }
-
- var oldWmsStore = await _wmsstoreRepository.FindByNameAsync(wmsstore.StoreCode);
- if (oldWmsStore != null)
- {
- var wmsstoreUpdateDto = new WmsStoreUpdateDto
- {
- StoreCode = wmsstore.StoreCode,
- StoreName = wmsstore.StoreName,
- Remark = wmsstore.Remark,
- };
-
- wmsstoreUpdateDtos.Add((wmsstore.RowIndex, oldWmsStore.Id, wmsstoreUpdateDto));
- }
- else
- {
- var wmsstoreCreateDto = new WmsStoreCreateDto
- {
- StoreCode = wmsstore.StoreCode,
- StoreName = wmsstore.StoreName,
- Remark = wmsstore.Remark,
- };
-
- wmsstoreCreateDtos.Add((wmsstore.RowIndex, wmsstoreCreateDto));
- }
- }
- }
-
- // 鏂板
- foreach (var wmsstoreDto in wmsstoreCreateDtos)
- {
- try
- {
- await CreateAsync(wmsstoreDto.Item);
- }
- catch (Exception e)
- {
- var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝绗瑊wmsstoreDto.RowIndex}琛岋細{e.Message}锛岀粓姝㈠鍏�";
- throw new UserFriendlyException(errorMsg);
- }
- }
-
- // 鏇存柊
- foreach (var wmsstoreDto in wmsstoreUpdateDtos)
- {
- try
- {
- await UpdateAsync(wmsstoreDto.Id, wmsstoreDto.Item);
- }
- catch (Exception e)
- {
- var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝绗瑊wmsstoreDto.RowIndex}琛岋細{e.Message}锛岀粓姝㈠鍏�";
- throw new UserFriendlyException(errorMsg);
- }
- }
- }
-
- /// <inheritdoc />
- public async Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsStoresInput input)
- {
- Check.NotNull(input, nameof(input));
-
- if (input.Sorting.IsNullOrWhiteSpace())
- {
- input.Sorting = nameof(WmsStore.Sort);
- }
-
- var specification = new WmsStoreSpecification(input.Name);
- var store = ObjectMapper.Map<GetWmsStoresInput, WmsStore>(input);
- var list = await _wmsstoreRepository.GetListAsync(store, input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter, specification, includeDetails: true);
- var result = ObjectMapper.Map<List<WmsStore>, List<WmsStoreDto>>(list);
-
- var sheets = new Dictionary<string, object>
- {
- ["閰嶇疆"] = ExportHelper.ConvertListToExportData(result),
- };
-
- var fileName = result.Count > 1 ? "WmsStore鍒楄〃" : result.Count == 1 ? result.First()?.StoreCode : "WmsStore妯＄増";
- return (sheets, fileName);
- }
-
- /// <summary>
- /// Checks the create or update dto asynchronous.
- /// </summary>
- /// <param name="input">The input.</param>
- protected Task CheckCreateOrUpdateDtoAsync(WmsStoreCreateOrUpdateDtoBase input)
- {
- Check.NotNull(input, nameof(input));
- Check.NotNullOrWhiteSpace(input.StoreCode, "缂栧彿", WmsStoreConsts.MaxCodeLength);
- Check.NotNullOrWhiteSpace(input.StoreName, "鍚嶇О", WmsStoreConsts.MaxNameLength);
- Check.Length(input.Remark, "澶囨敞", WmsStoreConsts.MaxRemarkLength);
- return Task.CompletedTask;
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsAreaAutoMapperProfile.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsAreaAutoMapperProfile.cs"
deleted file mode 100644
index ccf02e3..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsAreaAutoMapperProfile.cs"
+++ /dev/null
@@ -1,26 +0,0 @@
-using AutoMapper;
-using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsAreas;
-using CMS.Plugin.HIAWms.Domain.WmsAreas;
-using Volo.Abp.ObjectExtending;
-
-namespace CMS.Plugin.HIAWms.Application.MapperProfiles;
-
-/// <summary>
-/// AutoMapper閰嶇疆
-/// </summary>
-/// <seealso cref="AutoMapper.Profile" />
-public class WmsAreaAutoMapperProfile : Profile
-{
- /// <summary>
- /// Initializes a new instance of the <see cref="WmsAreaAutoMapperProfile"/> class.
- /// </summary>
- public WmsAreaAutoMapperProfile()
- {
- /* You can configure your AutoMapper mapping configuration here.
- * Alternatively, you can split your mapping configurations
- * into multiple profile classes for a better organization. */
- CreateMap<WmsArea, WmsAreaDto>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None);
- CreateMap<WmsAreaCreateDto, WmsArea>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None);
- CreateMap<GetWmsAreasInput, WmsArea>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None);
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsContainerAutoMapperProfile.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsContainerAutoMapperProfile.cs"
deleted file mode 100644
index 672037e..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsContainerAutoMapperProfile.cs"
+++ /dev/null
@@ -1,26 +0,0 @@
-using AutoMapper;
-using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsContainers;
-using CMS.Plugin.HIAWms.Domain.WmsContainers;
-using Volo.Abp.ObjectExtending;
-
-namespace CMS.Plugin.HIAWms.Application.MapperProfiles;
-
-/// <summary>
-/// AutoMapper閰嶇疆
-/// </summary>
-/// <seealso cref="AutoMapper.Profile" />
-public class WmsContainerAutoMapperProfile : Profile
-{
- /// <summary>
- /// Initializes a new instance of the <see cref="WmsContainerAutoMapperProfile"/> class.
- /// </summary>
- public WmsContainerAutoMapperProfile()
- {
- /* You can configure your AutoMapper mapping configuration here.
- * Alternatively, you can split your mapping configurations
- * into multiple profile classes for a better organization. */
- CreateMap<WmsContainer, WmsContainerDto>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None);
- CreateMap<WmsContainerCreateDto, WmsContainer>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None);
- CreateMap<GetWmsContainersInput, WmsContainer>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None);
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsInOutStockRecordAutoMapperProfile.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsInOutStockRecordAutoMapperProfile.cs"
deleted file mode 100644
index c4d9c53..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsInOutStockRecordAutoMapperProfile.cs"
+++ /dev/null
@@ -1,26 +0,0 @@
-using AutoMapper;
-using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsInOutStockRecord;
-using CMS.Plugin.HIAWms.Domain.WmsInOutStockRecord;
-using Volo.Abp.ObjectExtending;
-
-namespace CMS.Plugin.HIAWms.Application.MapperProfiles;
-
-/// <summary>
-/// 鍑哄叆搴撹褰曡〃AutoMapper閰嶇疆
-/// </summary>
-/// <seealso cref="AutoMapper.Profile" />
-public class WmsInOutStockRecordAutoMapperProfile : Profile
-{
- /// <summary>
- /// Initializes a new instance of the <see cref="WmsInOutStockRecordAutoMapperProfile"/> class.
- /// </summary>
- public WmsInOutStockRecordAutoMapperProfile()
- {
- /* You can configure your AutoMapper mapping configuration here.
- * Alternatively, you can split your mapping configurations
- * into multiple profile classes for a better organization. */
- CreateMap<WmsInOutStockRecord, WmsInOutStockRecordDto>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None);
- CreateMap<WmsInOutStockRecordCreateDto, WmsInOutStockRecord>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None);
- CreateMap<GetWmsInOutStockRecordInput, WmsInOutStockRecord>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None);
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsMaterialAutoMapperProfile.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsMaterialAutoMapperProfile.cs"
deleted file mode 100644
index a74d8b0..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsMaterialAutoMapperProfile.cs"
+++ /dev/null
@@ -1,26 +0,0 @@
-using AutoMapper;
-using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterial;
-using CMS.Plugin.HIAWms.Domain.WmsMaterial;
-using Volo.Abp.ObjectExtending;
-
-namespace CMS.Plugin.HIAWms.Application.MapperProfiles;
-
-/// <summary>
-/// AutoMapper閰嶇疆
-/// </summary>
-/// <seealso cref="AutoMapper.Profile" />
-public class WmsMaterialAutoMapperProfile : Profile
-{
- /// <summary>
- /// Initializes a new instance of the <see cref="WmsMaterialAutoMapperProfile"/> class.
- /// </summary>
- public WmsMaterialAutoMapperProfile()
- {
- /* You can configure your AutoMapper mapping configuration here.
- * Alternatively, you can split your mapping configurations
- * into multiple profile classes for a better organization. */
- CreateMap<WmsMaterial, WmsMaterialDto>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None);
- CreateMap<WmsMaterialCreateDto, WmsMaterial>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None);
- CreateMap<GetWmsMaterialInput, WmsMaterial>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None);
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsPlaceAutoMapperProfile.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsPlaceAutoMapperProfile.cs"
deleted file mode 100644
index f58553d..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsPlaceAutoMapperProfile.cs"
+++ /dev/null
@@ -1,26 +0,0 @@
-using AutoMapper;
-using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlaces;
-using CMS.Plugin.HIAWms.Domain.WmsPlaces;
-using Volo.Abp.ObjectExtending;
-
-namespace CMS.Plugin.HIAWms.Application.MapperProfiles;
-
-/// <summary>
-/// AutoMapper閰嶇疆
-/// </summary>
-/// <seealso cref="AutoMapper.Profile" />
-public class WmsPlaceAutoMapperProfile : Profile
-{
- /// <summary>
- /// Initializes a new instance of the <see cref="WmsPlaceAutoMapperProfile"/> class.
- /// </summary>
- public WmsPlaceAutoMapperProfile()
- {
- /* You can configure your AutoMapper mapping configuration here.
- * Alternatively, you can split your mapping configurations
- * into multiple profile classes for a better organization. */
- CreateMap<WmsPlace, WmsPlaceDto>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None);
- CreateMap<WmsPlaceCreateDto, WmsPlace>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None);
- CreateMap<GetWmsPlacesInput, WmsPlace>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None);
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsStoreAutoMapperProfile.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsStoreAutoMapperProfile.cs"
deleted file mode 100644
index 6bb3cce..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsStoreAutoMapperProfile.cs"
+++ /dev/null
@@ -1,26 +0,0 @@
-using AutoMapper;
-using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStores;
-using CMS.Plugin.HIAWms.Domain.WmsStores;
-using Volo.Abp.ObjectExtending;
-
-namespace CMS.Plugin.HIAWms.Application.MapperProfiles;
-
-/// <summary>
-/// AutoMapper閰嶇疆
-/// </summary>
-/// <seealso cref="AutoMapper.Profile" />
-public class WmsStoreAutoMapperProfile : Profile
-{
- /// <summary>
- /// Initializes a new instance of the <see cref="WmsStoreAutoMapperProfile"/> class.
- /// </summary>
- public WmsStoreAutoMapperProfile()
- {
- /* You can configure your AutoMapper mapping configuration here.
- * Alternatively, you can split your mapping configurations
- * into multiple profile classes for a better organization. */
- CreateMap<WmsStore, WmsStoreDto>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None);
- CreateMap<WmsStoreCreateDto, WmsStore>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None);
- CreateMap<GetWmsStoresInput, WmsStore>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None);
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/CMS.Plugin.HIAWms.Domain.Shared.csproj" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/CMS.Plugin.HIAWms.Domain.Shared.csproj"
deleted file mode 100644
index c95efe0..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/CMS.Plugin.HIAWms.Domain.Shared.csproj"
+++ /dev/null
@@ -1,28 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
- <Import Project="../../common.props" />
- <Import Project="../../configureawait.props" />
-
- <PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
- <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
- <GenerateDocumentationFile>True</GenerateDocumentationFile>
- </PropertyGroup>
-
- <ItemGroup>
- <PackageReference Include="KissUtil" Version="1.0.1" />
- <PackageReference Include="Volo.Abp.Localization" Version="$(ABPPackageVersion)" />
- <PackageReference Include="Volo.Abp.Validation" Version="$(ABPPackageVersion)" />
- </ItemGroup>
-
- <ItemGroup>
- <EmbeddedResource Include="Localization\HIAWms\*.json" />
- <Content Remove="Localization\HIAWms\*.json" />
- </ItemGroup>
-
- <ItemGroup>
- <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
- <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="6.0.20" />
- </ItemGroup>
-
-</Project>
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/CMSPluginDomainErrorCodes.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/CMSPluginDomainErrorCodes.cs"
deleted file mode 100644
index 9b9ab2e..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/CMSPluginDomainErrorCodes.cs"
+++ /dev/null
@@ -1,16 +0,0 @@
-namespace CMS.Plugin.HIAWms.Domain.Shared;
-
-/// <summary>
-/// 閿欒缂栫爜瀹氫箟
-/// </summary>
-public static class CMSPluginDomainErrorCodes
-{
- /// <summary>
- /// The prefix
- /// </summary>
- private const string Prefix = "CMS.Plugin.HIAWms:";
-
- /* You can add your business exception error codes here, as constants */
-
- public const string NameAlreadyExists = Prefix + nameof(NameAlreadyExists);
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/CMSPluginDomainSharedModule.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/CMSPluginDomainSharedModule.cs"
deleted file mode 100644
index 8799472..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/CMSPluginDomainSharedModule.cs"
+++ /dev/null
@@ -1,41 +0,0 @@
-using CMS.Plugin.HIAWms.Domain.Shared.Localization;
-using Volo.Abp.Localization;
-using Volo.Abp.Modularity;
-using Volo.Abp.Validation;
-using Volo.Abp.Validation.Localization;
-using Volo.Abp.VirtualFileSystem;
-
-namespace CMS.Plugin.HIAWms.Domain.Shared;
-
-/// <summary>
-/// 棰嗗煙鍏变韩妯″潡
-/// </summary>
-[DependsOn(typeof(AbpLocalizationModule),
- typeof(AbpValidationModule))]
-public class CMSPluginDomainSharedModule : AbpModule
-{
- /// <inheritdoc />
- public override void PreConfigureServices(ServiceConfigurationContext context)
- {
- CMSPluginModuleExtensionConfigurator.Configure();
- }
-
- /// <inheritdoc />
- public override void ConfigureServices(ServiceConfigurationContext context)
- {
- Configure<AbpVirtualFileSystemOptions>(options =>
- {
- options.FileSets.AddEmbedded<CMSPluginDomainSharedModule>();
- });
-
- Configure<AbpLocalizationOptions>(options =>
- {
- options.Resources
- .Add<HIAWmsResource>("en")
- .AddBaseTypes(typeof(AbpValidationResource))
- .AddVirtualJson("/Localization/HIAWms");
-
- options.DefaultResourceType = typeof(HIAWmsResource);
- });
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/CMSPluginModuleExtensionConfigurator.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/CMSPluginModuleExtensionConfigurator.cs"
deleted file mode 100644
index d372e79..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/CMSPluginModuleExtensionConfigurator.cs"
+++ /dev/null
@@ -1,82 +0,0 @@
-using Volo.Abp.Threading;
-
-namespace CMS.Plugin.HIAWms.Domain.Shared;
-
-/// <summary>
-/// 妯″潡鎵╁睍閰嶇疆鍣�
-/// </summary>
-public static class CMSPluginModuleExtensionConfigurator
-{
- private static readonly OneTimeRunner OneTimeRunner = new OneTimeRunner();
-
- /// <summary>
- /// Configures this instance.
- /// </summary>
- public static void Configure()
- {
- OneTimeRunner.Run(() =>
- {
- ConfigureExistingProperties();
- ConfigureExtraProperties();
- });
- }
-
- /// <summary>
- /// Configures the existing properties.
- /// </summary>
- private static void ConfigureExistingProperties()
- {
- /* You can change max lengths for properties of the
- * entities defined in the modules used by your application.
- *
- * Example: Change user and role name max lengths
-
- IdentityUserConsts.MaxNameLength = 99;
- IdentityRoleConsts.MaxNameLength = 99;
-
- * Notice: It is not suggested to change property lengths
- * unless you really need it. Go with the standard values wherever possible.
- *
- * If you are using EF Core, you will need to run the add-migration command after your changes.
- */
- }
-
- /// <summary>
- /// Configures the extra properties.
- /// </summary>
- private static void ConfigureExtraProperties()
- {
- /* You can configure extra properties for the
- * entities defined in the modules used by your application.
- *
- * This class can be used to define these extra properties
- * with a high level, easy to use API.
- *
- * Example: Add a new property to the user entity of the identity module
-
- ObjectExtensionManager.Instance.Modules()
- .ConfigureIdentity(identity =>
- {
- identity.ConfigureUser(user =>
- {
- user.AddOrUpdateProperty<string>( //property type: string
- "SocialSecurityNumber", //property name
- property =>
- {
- //validation rules
- property.Attributes.Add(new RequiredAttribute());
- property.Attributes.Add(new StringLengthAttribute(64) {MinimumLength = 4});
-
- property.Configuration[IdentityModuleExtensionConsts.ConfigurationNames.AllowUserToEdit] = true;
-
- //...other configurations for this property
- }
- );
- });
- });
-
- * See the documentation for more:
- * https://docs.abp.io/en/abp/latest/Module-Entity-Extensions
- */
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/AreaStatusEnum.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/AreaStatusEnum.cs"
deleted file mode 100644
index b648ea3..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/AreaStatusEnum.cs"
+++ /dev/null
@@ -1,28 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace CMS.Plugin.HIAWms.Domain.Shared.Enums
-{
- /// <summary>
- /// 搴撳尯鐘舵��
- /// </summary>
- [Description("搴撳尯鐘舵��")]
- public enum AreaStatusEnum
- {
- /// <summary>
- /// 姝ｅ父
- /// </summary>
- [Description("姝ｅ父")]
- ZHEGNCHANGSHIYONG = 1,
-
- /// <summary>
- /// 鍋滅敤
- /// </summary>
- [Description("鍋滅敤")]
- TINGYONG = 2
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/AreaTypeEnum.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/AreaTypeEnum.cs"
deleted file mode 100644
index a82746a..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/AreaTypeEnum.cs"
+++ /dev/null
@@ -1,23 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace CMS.Plugin.HIAWms.Domain.Shared.Enums
-{
-
- /// <summary>
- /// 搴撳尯绫诲瀷
- /// </summary>
- [Description("搴撳尯绫诲瀷")]
- public enum AreaTypeEnum
- {
- /// <summary>
- /// 绔嬩綋搴�
- /// </summary>
- [Description("绔嬩綋搴�")]
- LITIKU = 1,
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/ContainerStatusEnum.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/ContainerStatusEnum.cs"
deleted file mode 100644
index 644e4d3..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/ContainerStatusEnum.cs"
+++ /dev/null
@@ -1,55 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace CMS.Plugin.HIAWms.Domain.Shared.Enums
-{
-
- /// <summary>
- /// 鎵樼洏鐘舵��
- /// </summary>
- [Description("鎵樼洏鐘舵��")]
- public enum ContainerStatusEnum
- {
-
- /// <summary>
- /// 绌洪棽
- /// </summary>
- [Description("绌洪棽")]
- KOUXIAN = 1,
-
- /// <summary>
- /// 缁勭洏
- /// </summary>
- [Description("缁勭洏")]
- ZUPANG = 2,
-
- /// <summary>
- /// 搴撲綅
- /// </summary>
- [Description("搴撲綅")]
- KUWEI = 3,
-
- /// <summary>
- /// 铏氭嫙搴撲綅
- /// </summary>
- [Description("铏氭嫙搴撲綅")]
- XUNIKUWEI = 4,
-
- /// <summary>
- /// 缁勬墭
- /// </summary>
- [Description("缁勬墭")]
- ZUTUO = 5,
-
- /// <summary>
- /// 寮傚父
- /// </summary>
- [Description("寮傚父")]
- EXCEPTION = 9,
- }
-
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/ContainerTypeEnum.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/ContainerTypeEnum.cs"
deleted file mode 100644
index 27089a7..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/ContainerTypeEnum.cs"
+++ /dev/null
@@ -1,35 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace CMS.Plugin.HIAWms.Domain.Shared.Enums
-{
- /// <summary>
- /// 鎵樼洏绫诲瀷
- /// </summary>
- [Description("鎵樼洏绫诲瀷")]
- public enum ContainerTypeEnum
- {
- /// <summary>
- /// 鑷埗浠舵墭鐩�
- /// </summary>
- [Description("鑷埗浠舵墭鐩�")]
- ZIZHIJIAN = 1,
-
- /// <summary>
- /// 澶栧崗浠舵墭鐩�
- /// </summary>
- [Description("澶栧崗浠舵墭鐩�")]
- WAIXIEJIAN = 2,
-
- /// <summary>
- /// 铏氭嫙鎵樼洏
- /// </summary>
- [Description("铏氭嫙鎵樼洏")]
- XUNI = 3,
-
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/HIAWmsStatus.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/HIAWmsStatus.cs"
deleted file mode 100644
index 1b789af..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/HIAWmsStatus.cs"
+++ /dev/null
@@ -1,34 +0,0 @@
-using System.ComponentModel;
-
-namespace CMS.Plugin.HIAWms.Domain.Shared.Enums
-{
- /// <summary>
- /// HIAWms鐘舵��
- /// </summary>
- public enum HIAWmsStatus : byte
- {
- /// <summary>
- /// 鏈墽琛�
- /// </summary>
- [Description("鏈墽琛�")]
- Initial = 0,
-
- /// <summary>
- /// 鎵ц涓�
- /// </summary>
- [Description("鎵ц涓�")]
- Excuting = 1,
-
- /// <summary>
- /// 宸插畬鎴�
- /// </summary>
- [Description("宸插畬鎴�")]
- Completed = 4,
-
- /// <summary>
- /// 宸插己鍒跺畬鎴�
- /// </summary>
- [Description("宸插畬鎴�")]
- Finished = 5,
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/MaterialTypeEnum.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/MaterialTypeEnum.cs"
deleted file mode 100644
index 1b1d81f..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/MaterialTypeEnum.cs"
+++ /dev/null
@@ -1,40 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace CMS.Plugin.HIAWms.Domain.Shared.Enums
-{
- /// <summary>
- /// 鐗╂枡绫诲瀷
- /// </summary>
- [Description("鐗╂枡绫诲瀷")]
- public enum MaterialTypeEnum
- {
- /// <summary>
- /// 鎴愬搧
- /// </summary>
- [Description(" 鎴愬搧")]
- FinishedGoods =1,
-
- /// <summary>
- /// 鍗婃垚鍝�
- /// </summary>
- [Description("鍗婃垚鍝�")]
- SemiFinishedGoods =2,
-
- /// <summary>
- /// 鍘熸潗鏂�
- /// </summary>
- [Description("鍘熸潗鏂�")]
- RawMaterials =3,
-
- /// <summary>
- /// 闄勪欢
- /// </summary>
- [Description(" 闄勪欢")]
- Attachments =4
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/PlaceStatusEnum.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/PlaceStatusEnum.cs"
deleted file mode 100644
index 744ffae..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/PlaceStatusEnum.cs"
+++ /dev/null
@@ -1,37 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace CMS.Plugin.HIAWms.Domain.Shared.Enums
-{
- /// <summary>
- /// 搴撲綅鐘舵��
- /// </summary>
- [Description("搴撲綅鐘舵��")]
- public enum PlaceStatusEnum
- {
- /// <summary>
- /// 绌洪棽
- /// </summary>
- [Description("绌洪棽")]
- KONGXIAN = 1,
- /// <summary>
- /// 寰呭叆
- /// </summary>
- [Description("寰呭叆")]
- DAIRU = 2,
- /// <summary>
- /// 瀛樿揣
- /// </summary>
- [Description("瀛樿揣")]
- CUNHUO = 3,
- /// <summary>
- /// 寰呭嚭
- /// </summary>
- [Description("寰呭嚭")]
- DAICHU = 4,
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/PlaceTypeEnum.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/PlaceTypeEnum.cs"
deleted file mode 100644
index b6832db..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/PlaceTypeEnum.cs"
+++ /dev/null
@@ -1,25 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace CMS.Plugin.HIAWms.Domain.Shared.Enums
-{
- /// <summary>
- /// 搴撲綅绫诲瀷
- /// </summary>
- [Description("搴撲綅绫诲瀷")]
- public enum PlaceTypeEnum
- {
- /// <summary>
- /// 鍘熸枡搴撲綅
- /// </summary>
- [Description("鍘熸枡搴撲綅")]
- YUANLIAOKUWEI = 1,
-
- [Description("铏氭嫙搴撲綅")]
- XUNIKUWEI = 2,
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/PurchaseTypeEnum.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/PurchaseTypeEnum.cs"
deleted file mode 100644
index 43fd5ec..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/PurchaseTypeEnum.cs"
+++ /dev/null
@@ -1,34 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace CMS.Plugin.HIAWms.Domain.Shared.Enums
-{
- /// <summary>
- /// 閲囪喘绫诲瀷
- /// </summary>
- [Description("閲囪喘绫诲瀷")]
- public enum PurchaseTypeEnum
- {
- /// <summary>
- /// /鑷埗
- /// </summary>
- [Description("鑷埗")]
- SelfMade = 1,
-
- /// <summary>
- /// 閲囪喘
- /// </summary>
- [Description("閲囪喘")]
- Purchased = 2,
-
- /// <summary>
- /// 鍧囧彲
- /// </summary>
- [Description("鍧囧彲")]
- Both = 3
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/SonTaskTypeEnum.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/SonTaskTypeEnum.cs"
deleted file mode 100644
index 2bebd34..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/SonTaskTypeEnum.cs"
+++ /dev/null
@@ -1,51 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace CMS.Plugin.HIAWms.Domain.Shared.Enums
-{
- /// <summary>
- /// 瀛愪换鍔＄被鍨�
- /// </summary>
- [Description("瀛愪换鍔＄被鍨�")]
- public enum SonTaskTypeEnum
- {
- /// <summary>
- /// 鑷姩鍏ュ簱
- /// </summary>
- [Description("鑷姩鍏ュ簱")]
- ZDRUKU = 1,
-
- /// <summary>
- /// 浜哄伐鍏ュ簱
- /// </summary>
- [Description("浜哄伐鍏ュ簱")]
- RGRUKU = 2,
-
- /// <summary>
- /// 浜哄伐鍑哄簱
- /// </summary>
- [Description("浜哄伐鍑哄簱")]
- RGCHUKU = 3,
- /// <summary>
- /// 鑷姩鍑哄簱
- /// </summary>
- [Description("鑷姩鍑哄簱")]
- ZDCHUKU = 4,
-
- /// <summary>
- /// 绌烘墭鍛煎彨
- /// </summary>
- [Description("绌烘墭鍛煎彨")]
- KTHUJIOA = 5,
-
- /// <summary>
- /// 鍥炲簱
- /// </summary>
- [Description("鍥炲簱")]
- HUIKU = 6,
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/StockTypeEnum.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/StockTypeEnum.cs"
deleted file mode 100644
index a7d0926..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/StockTypeEnum.cs"
+++ /dev/null
@@ -1,28 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace CMS.Plugin.HIAWms.Domain.Shared.Enums
-{
- /// <summary>
- /// 搴撳瓨绫诲瀷
- /// </summary>
- [Description("搴撳瓨绫诲瀷")]
- public enum StockTypeEnum
- {
- /// <summary>
- /// 鍏ュ簱
- /// </summary>
- [Description("鍏ュ簱")]
- InBound = 1,
-
- /// <summary>
- /// 鍑哄簱
- /// </summary>
- [Description("鍑哄簱")]
- OutBound = 2,
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/TaskTypeEnum.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/TaskTypeEnum.cs"
deleted file mode 100644
index b22ffaf..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/TaskTypeEnum.cs"
+++ /dev/null
@@ -1,28 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace CMS.Plugin.HIAWms.Domain.Shared.Enums
-{
- /// <summary>
- /// 浠诲姟绫诲瀷
- /// </summary>
- [Description("浠诲姟绫诲瀷")]
- public enum TaskTypeEnum
- {
- /// <summary>
- /// 鍑哄簱
- /// </summary>
- [Description("鍑哄簱")]
- CHUKU = 1,
-
- /// <summary>
- /// 鍏ュ簱
- /// </summary>
- [Description("鍏ュ簱")]
- RUKU = 2,
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/WmsTaskStatus.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/WmsTaskStatus.cs"
deleted file mode 100644
index 211dff5..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/WmsTaskStatus.cs"
+++ /dev/null
@@ -1,42 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace CMS.Plugin.HIAWms.Domain.Shared.Enums
-{
- /// <summary>
- /// 浠诲姟鐘舵��
- /// </summary>
- [Description("浠诲姟鐘舵��")]
- public enum WmsTaskStatus
- {
- /// <summary>
- /// 鏈墽琛�
- /// </summary>
- [Description("鏈墽琛�")]
- WEIZHIXING = 1,
- /// <summary>
- /// 寰呮墽琛�
- /// </summary>
- [Description("寰呮墽琛�")]
- DAIZHIXINGZHONG = 2,
- /// <summary>
- /// 鎵ц涓�
- /// </summary>
- [Description("鎵ц涓�")]
- ZHIXINGZHONG = 3,
- /// <summary>
- /// 瀹屾垚
- /// </summary>
- [Description("瀹屾垚")]
- WANCHENG = 4,
- /// <summary>
- /// 鍙栨秷
- /// </summary>
- [Description("鍙栨秷")]
- QUXIAO = 5
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/YesNoEnum.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/YesNoEnum.cs"
deleted file mode 100644
index 74e48fe..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/YesNoEnum.cs"
+++ /dev/null
@@ -1,28 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace CMS.Plugin.HIAWms.Domain.Shared.Enums
-{
- /// <summary>
- /// 鏄惁閿佸畾
- /// </summary>
- [Description("鏄惁閿佸畾")]
- public enum YesNoEnum
- {
- /// <summary>
- /// 鏄�
- /// </summary>
- [Description("鏄�")]
- Y = 1,
-
- /// <summary>
- /// 鍚�
- /// </summary>
- [Description("鍚�")]
- N = 2
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/Localization/HIAWms/en.json" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/Localization/HIAWms/en.json"
deleted file mode 100644
index bd3869e..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/Localization/HIAWms/en.json"
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "culture": "en",
- "texts": {
- "DisplayName:SCMS.AppSettings.HIAWms.PluginState": "HIAWms plugin state",
- "CMS.Plugin.HIAWms:NameAlreadyExists": "The '{0}' name already exists, please re-enter it !"
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/Localization/HIAWms/zh-Hans.json" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/Localization/HIAWms/zh-Hans.json"
deleted file mode 100644
index 2462f22..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/Localization/HIAWms/zh-Hans.json"
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "culture": "zh-Hans",
- "texts": {
- "DisplayName:SCMS.AppSettings.HIAWms.PluginState": "HIAWms 鎻掍欢鐘舵��",
- "CMS.Plugin.HIAWms:NameAlreadyExists": "璇�'{0}'鍚嶇О宸插瓨鍦紝璇烽噸鏂拌緭鍏ワ紒"
- }
- }
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/Localization/HIAWmsResource.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/Localization/HIAWmsResource.cs"
deleted file mode 100644
index e0c1448..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/Localization/HIAWmsResource.cs"
+++ /dev/null
@@ -1,11 +0,0 @@
-using Volo.Abp.Localization;
-
-namespace CMS.Plugin.HIAWms.Domain.Shared.Localization;
-
-/// <summary>
-/// HIAWms鏈湴鍖栬祫婧�
-/// </summary>
-[LocalizationResourceName("HIAWms")]
-public class HIAWmsResource
-{
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/Util/EnumHelper.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/Util/EnumHelper.cs"
deleted file mode 100644
index c79ae29..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/Util/EnumHelper.cs"
+++ /dev/null
@@ -1,84 +0,0 @@
-锘縰sing KissUtil.Helpers;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Volo.Abp;
-
-namespace CMS.Plugin.HIAWms.Domain.Shared.Util
-{
- /// <summary>
- /// 鏋氫妇甯姪绫�.
- /// </summary>
- public static class EnumHelper
- {
- /// <summary>
- /// 鑾峰彇鏋氫妇.
- /// </summary>
- /// <param name="enumName"> </param>
- /// <returns></returns>
- /// <exception cref="ArgumentException"></exception>
- public static List<EnumItem> GetEnumItems(string enumName)
- {
- // 鑾峰彇褰撳墠绋嬪簭闆嗕腑鐨勬墍鏈夌被鍨�
- var enumType = AppDomain.CurrentDomain.GetAssemblies()
- .SelectMany(a => a.GetTypes())
- .FirstOrDefault(t => t.Name == enumName && t.IsEnum);
-
- if (enumType == null)
- {
- throw new UserFriendlyException($"鏋氫妇绫诲瀷 {enumName} 涓嶅瓨鍦�");
- }
-
- return GetEnumItems(enumType);
- }
-
- /// <summary>
- /// 鑾峰彇鏋氫妇绫诲瀷.
- /// </summary>
- /// <param name="enumType"></param>
- /// <returns></returns>
- /// <exception cref="ArgumentException"></exception>
- public static List<EnumItem> GetEnumItems(Type enumType)
- {
- if (!enumType.IsEnum)
- {
- throw new UserFriendlyException("鎻愪緵鐨勭被鍨嬩笉鏄灇涓剧被鍨�");
- }
-
- var result = new List<EnumItem>();
- var values = Enum.GetValues(enumType);
-
- foreach (var value in values)
- {
- var fieldInfo = enumType.GetField(value.ToString());
- var description = fieldInfo?
- .GetCustomAttributes(typeof(DescriptionAttribute), false)
- .FirstOrDefault() as DescriptionAttribute;
-
- result.Add(new EnumItem
- {
- Value = (int)value,
- Name = value.ToString(),
- Description = description?.Description ?? value.ToString(),
- });
- }
-
- return result;
- }
- }
-
- /// <summary>
- /// 鏋氫妇鎻忚堪.
- /// </summary>
- public class EnumItem
- {
- public int Value { get; set; }
-
- public string Name { get; set; }
-
- public string Description { get; set; }
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/Util/ExportHelper.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/Util/ExportHelper.cs"
deleted file mode 100644
index b0f8e3b..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/Util/ExportHelper.cs"
+++ /dev/null
@@ -1,59 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Reflection;
-using System.Threading.Tasks;
-
-namespace CMS.Plugin.HIAWms.Domain.Shared.Util
-{
- /// <summary>
- /// 瀵煎嚭甯姪绫�.
- /// </summary>
- public static class ExportHelper
- {
- // 閫氱敤杞崲鏂规硶锛堝吋瀹� Func<T, Dictionary<string, object>>锛�
- public static Dictionary<string, object> ConvertToExportData<T>(T entity)
- {
- var dict = new Dictionary<string, object>();
- if (entity == null) return dict;
-
- foreach (var prop in typeof(T).GetProperties())
- {
- var value = prop.GetValue(entity);
- dict[prop.Name] = FormatValue(value);
- }
- return dict;
- }
-
- // 鎵归噺杞崲鏂规硶
- public static List<Dictionary<string, object>> ConvertListToExportData<T>(IEnumerable<T> list)
- {
- return list.Select(ConvertToExportData).ToList();
- }
-
- private static object FormatValue(object value)
- {
- if (value == null) return string.Empty;
-
- // 澶勭悊鏋氫妇
- if (value is Enum enumValue)
- return GetEnumDescriptionUtil.GetEnumDescription(enumValue);
-
- // 澶勭悊甯冨皵
- if (value is bool boolValue)
- return boolValue ? "鏄�" : "鍚�";
-
- return value;
- }
-
- private static string GetEnumDescription(Enum value)
- {
- var fieldInfo = value.GetType().GetField(value.ToString());
- var description = fieldInfo?
- .GetCustomAttributes(typeof(DescriptionAttribute), false)
- .FirstOrDefault() as DescriptionAttribute;
- return description?.Description ?? value.ToString();
- }
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/Util/GetEnumDescriptionUtil.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/Util/GetEnumDescriptionUtil.cs"
deleted file mode 100644
index d65574b..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/Util/GetEnumDescriptionUtil.cs"
+++ /dev/null
@@ -1,30 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace CMS.Plugin.HIAWms
-{
- public class GetEnumDescriptionUtil
- {
- /// <summary>
- /// 鑾峰彇鏋氫妇鐨勬弿杩�
- /// </summary>
- /// <param name="enumValue"></param>
- /// <returns></returns>
- public static string GetEnumDescription(Enum enumValue)
- {
- string value = enumValue.ToString();
- if (string.IsNullOrWhiteSpace(value) || value == "0") return "";
- FieldInfo field = enumValue.GetType().GetField(value);
- object[] objs = field.GetCustomAttributes(typeof(DescriptionAttribute), false); //鑾峰彇鎻忚堪灞炴��
- if (objs == null || objs.Length == 0) //褰撴弿杩板睘鎬ф病鏈夋椂锛岀洿鎺ヨ繑鍥炲悕绉�
- return value;
- DescriptionAttribute descriptionAttribute = (DescriptionAttribute)objs[0];
- return descriptionAttribute.Description;
- }
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/WmsAreas/WmsAreaConsts.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/WmsAreas/WmsAreaConsts.cs"
deleted file mode 100644
index 42fc92d..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/WmsAreas/WmsAreaConsts.cs"
+++ /dev/null
@@ -1,24 +0,0 @@
-namespace CMS.Plugin.HIAWms.Domain.Shared.WmsAreas;
-
-/// <summary>
-/// WmsArea甯搁噺瀹氫箟
-/// </summary>
-public static class WmsAreaConsts
-{
- public const string CloneTag = "_鍓湰";
- public static int MaxCodeLength { get; set; } = 64;
- public static int MaxNameLength { get; set; } = 64;
- public static int MaxRemarkLength { get; set; } = 256;
-
- public static int MaxAreaNoLength = 50;
-
- public static int MaxAreaNameLength = 100;
-
- public static int MaxAreaDescLength = 200;
-
- public static int MaxRedundantFieldLength = 100;
-
- public static int MaxStoreCodeLength = 50;
-
- public static int MaxStoreNameLength = 100;
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/WmsAreas/WmsAreaEto.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/WmsAreas/WmsAreaEto.cs"
deleted file mode 100644
index aa47ec0..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/WmsAreas/WmsAreaEto.cs"
+++ /dev/null
@@ -1,22 +0,0 @@
-namespace CMS.Plugin.HIAWms.Domain.Shared.WmsAreas;
-
-/// <summary>
-/// WmsArea浜嬩欢鍙傛暟瀵硅薄
-/// </summary>
-[Serializable]
-public class WmsAreaEto
-{
- /// <summary>
- /// Initializes a new instance of the <see cref="WmsAreaEto"/> class.
- /// </summary>
- /// <param name="name">The name.</param>
- public WmsAreaEto(string name)
- {
- Name = name;
- }
-
- /// <summary>
- /// 鍚嶇О
- /// </summary>
- public string Name { get; }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/WmsContainers/WmsContainerConsts.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/WmsContainers/WmsContainerConsts.cs"
deleted file mode 100644
index 8d5cf01..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/WmsContainers/WmsContainerConsts.cs"
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace CMS.Plugin.HIAWms.Domain.Shared.WmsContainers;
-
-/// <summary>
-/// WmsContainer甯搁噺瀹氫箟
-/// </summary>
-public static class WmsContainerConsts
-{
- public const string CloneTag = "_鍓湰";
- public static int MaxCodeLength { get; set; } = 64;
- public static int MaxNameLength { get; set; } = 64;
- public static int MaxRemarkLength { get; set; } = 256;
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/WmsContainers/WmsContainerEto.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/WmsContainers/WmsContainerEto.cs"
deleted file mode 100644
index 5bdd117..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/WmsContainers/WmsContainerEto.cs"
+++ /dev/null
@@ -1,22 +0,0 @@
-namespace CMS.Plugin.HIAWms.Domain.Shared.WmsContainers;
-
-/// <summary>
-/// WmsContainer浜嬩欢鍙傛暟瀵硅薄
-/// </summary>
-[Serializable]
-public class WmsContainerEto
-{
- /// <summary>
- /// Initializes a new instance of the <see cref="WmsContainerEto"/> class.
- /// </summary>
- /// <param name="name">The name.</param>
- public WmsContainerEto(string name)
- {
- Name = name;
- }
-
- /// <summary>
- /// 鍚嶇О
- /// </summary>
- public string Name { get; }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/WmsMaterial/WmsMaterialConsts.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/WmsMaterial/WmsMaterialConsts.cs"
deleted file mode 100644
index 091a162..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/WmsMaterial/WmsMaterialConsts.cs"
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace CMS.Plugin.HIAWms.Domain.Shared.WmsMaterial;
-
-/// <summary>
-/// WmsMaterial甯搁噺瀹氫箟
-/// </summary>
-public static class WmsMaterialConsts
-{
- public const string CloneTag = "_鍓湰";
- public static int MaxCodeLength { get; set; } = 64;
- public static int MaxNameLength { get; set; } = 64;
- public static int MaxRemarkLength { get; set; } = 256;
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/WmsMaterial/WmsMaterialEto.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/WmsMaterial/WmsMaterialEto.cs"
deleted file mode 100644
index d7144a0..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/WmsMaterial/WmsMaterialEto.cs"
+++ /dev/null
@@ -1,22 +0,0 @@
-namespace CMS.Plugin.HIAWms.Domain.Shared.WmsMaterial;
-
-/// <summary>
-/// WmsMaterial浜嬩欢鍙傛暟瀵硅薄
-/// </summary>
-[Serializable]
-public class WmsMaterialEto
-{
- /// <summary>
- /// Initializes a new instance of the <see cref="WmsMaterialEto"/> class.
- /// </summary>
- /// <param name="name">The name.</param>
- public WmsMaterialEto(string name)
- {
- Name = name;
- }
-
- /// <summary>
- /// 鍚嶇О
- /// </summary>
- public string Name { get; }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/WmsPlaces/WmsPlaceConsts.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/WmsPlaces/WmsPlaceConsts.cs"
deleted file mode 100644
index 5434bf3..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/WmsPlaces/WmsPlaceConsts.cs"
+++ /dev/null
@@ -1,18 +0,0 @@
-namespace CMS.Plugin.HIAWms.Domain.Shared.WmsPlaces;
-
-/// <summary>
-/// WmsPlace甯搁噺瀹氫箟
-/// </summary>
-public static class WmsPlaceConsts
-{
- public const string CloneTag = "_鍓湰";
- public static int MaxCodeLength { get; set; } = 64;
- public static int MaxNameLength { get; set; } = 64;
- public static int MaxRemarkLength { get; set; } = 256;
-
- public const int MaxPlaceNoLength = 50;
-
- public const int MaxAreaCodeLength = 50;
-
- public const int MaxRedundantFieldLength = 100;
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/WmsPlaces/WmsPlaceEto.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/WmsPlaces/WmsPlaceEto.cs"
deleted file mode 100644
index 3fb3b72..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/WmsPlaces/WmsPlaceEto.cs"
+++ /dev/null
@@ -1,22 +0,0 @@
-namespace CMS.Plugin.HIAWms.Domain.Shared.WmsPlaces;
-
-/// <summary>
-/// WmsPlace浜嬩欢鍙傛暟瀵硅薄
-/// </summary>
-[Serializable]
-public class WmsPlaceEto
-{
- /// <summary>
- /// Initializes a new instance of the <see cref="WmsPlaceEto"/> class.
- /// </summary>
- /// <param name="name">The name.</param>
- public WmsPlaceEto(string name)
- {
- Name = name;
- }
-
- /// <summary>
- /// 鍚嶇О
- /// </summary>
- public string Name { get; }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/WmsStores/WmsStoreConsts.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/WmsStores/WmsStoreConsts.cs"
deleted file mode 100644
index a78636c..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/WmsStores/WmsStoreConsts.cs"
+++ /dev/null
@@ -1,18 +0,0 @@
-namespace CMS.Plugin.HIAWms.Domain.Shared.WmsStores;
-
-/// <summary>
-/// WmsStore甯搁噺瀹氫箟
-/// </summary>
-public static class WmsStoreConsts
-{
- public const string CloneTag = "_鍓湰";
- public static int MaxCodeLength { get; set; } = 64;
- public static int MaxNameLength { get; set; } = 64;
- public static int MaxRemarkLength { get; set; } = 256;
-
- public const int MaxStoreCodeLength = 50;
-
- public const int MaxStoreNameLength = 100;
-
- public const int MaxRedundantFieldLength = 100;
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/WmsStores/WmsStoreEto.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/WmsStores/WmsStoreEto.cs"
deleted file mode 100644
index 72d1757..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/WmsStores/WmsStoreEto.cs"
+++ /dev/null
@@ -1,22 +0,0 @@
-namespace CMS.Plugin.HIAWms.Domain.Shared.WmsStores;
-
-/// <summary>
-/// WmsStore浜嬩欢鍙傛暟瀵硅薄
-/// </summary>
-[Serializable]
-public class WmsStoreEto
-{
- /// <summary>
- /// Initializes a new instance of the <see cref="WmsStoreEto"/> class.
- /// </summary>
- /// <param name="name">The name.</param>
- public WmsStoreEto(string name)
- {
- Name = name;
- }
-
- /// <summary>
- /// 鍚嶇О
- /// </summary>
- public string Name { get; }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/CMS.Plugin.HIAWms.Domain.csproj" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/CMS.Plugin.HIAWms.Domain.csproj"
deleted file mode 100644
index c04520e..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/CMS.Plugin.HIAWms.Domain.csproj"
+++ /dev/null
@@ -1,27 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
- <Import Project="../../common.props" />
- <Import Project="../../configureawait.props" />
-
- <PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
- </PropertyGroup>
-
- <ItemGroup>
- <PackageReference Include="Volo.Abp.Ddd.Domain" Version="$(ABPPackageVersion)" />
- <PackageReference Include="Volo.Abp.Settings" Version="$(ABPPackageVersion)" />
- <PackageReference Include="Volo.Abp.Caching" Version="$(ABPPackageVersion)" />
- </ItemGroup>
-
- <ItemGroup>
- <ProjectReference Include="..\CMS.Plugin.HIAWms.Abstractions\CMS.Plugin.HIAWms.Abstractions.csproj" />
- <ProjectReference Include="..\CMS.Plugin.HIAWms.Domain.Shared\CMS.Plugin.HIAWms.Domain.Shared.csproj" />
- </ItemGroup>
-
- <ItemGroup>
- <Reference Include="CmsQueryExtensions">
- <HintPath>..\..\..\..\..\CommonDLL\CmsQueryExtensions.dll</HintPath>
- </Reference>
- </ItemGroup>
-
-</Project>
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/CMSPluginDbProperties.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/CMSPluginDbProperties.cs"
deleted file mode 100644
index cf46a7e..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/CMSPluginDbProperties.cs"
+++ /dev/null
@@ -1,27 +0,0 @@
-namespace CMS.Plugin.HIAWms.Domain;
-
-/// <summary>
-/// 鏁版嵁搴撳睘鎬у畾涔�
-/// </summary>
-public static class CMSPluginDbProperties
-{
- /// <summary>
- /// Gets or sets the database table prefix.
- /// </summary>
- public static string DbTablePrefix { get; set; } = "SCMS";
-
- /// <summary>
- /// Gets or sets the database schema.
- /// </summary>
- public static string DbSchema { get; set; }
-
- /// <summary>
- /// The connection string name
- /// </summary>
- public const string ConnectionStringName = "HIAWms";
-
- /// <summary>
- /// The migrations history table
- /// </summary>
- public const string MigrationsHistoryTable = "__EFMigrationsHistoryForHIAWms";
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/CMSPluginDomainModule.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/CMSPluginDomainModule.cs"
deleted file mode 100644
index 3a03e2e..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/CMSPluginDomainModule.cs"
+++ /dev/null
@@ -1,24 +0,0 @@
-using CMS.Plugin.HIAWms.Domain.Shared;
-using Volo.Abp.Caching;
-using Volo.Abp.Domain;
-using Volo.Abp.Modularity;
-using Volo.Abp.Settings;
-
-namespace CMS.Plugin.HIAWms.Domain;
-
-/// <summary>
-/// 棰嗗煙妯″潡
-/// </summary>
-[DependsOn(
- typeof(CMSPluginDomainSharedModule),
- typeof(AbpSettingsModule),
- typeof(AbpDddDomainModule),
- typeof(AbpCachingModule)
-)]
-public class CMSPluginDomainModule : AbpModule
-{
- /// <inheritdoc />
- public override void ConfigureServices(ServiceConfigurationContext context)
- {
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/Data/CMSPluginDbMigrationService.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/Data/CMSPluginDbMigrationService.cs"
deleted file mode 100644
index e9d224c..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/Data/CMSPluginDbMigrationService.cs"
+++ /dev/null
@@ -1,211 +0,0 @@
-using Microsoft.Extensions.Logging;
-using System.Diagnostics;
-using System.Runtime.InteropServices;
-using Volo.Abp.Data;
-using Volo.Abp.DependencyInjection;
-
-namespace CMS.Plugin.HIAWms.Domain.Data;
-
-/// <summary>
-/// 鏁版嵁搴撹縼绉绘湇鍔�
-/// </summary>
-public class CMSPluginDbMigrationService : ITransientDependency
-{
- private readonly IDataSeeder _dataSeeder;
- private readonly IEnumerable<ICMSPluginDbSchemaMigrator> _dbSchemaMigrators;
- private readonly ILogger<CMSPluginDbMigrationService> _logger;
-
- /// <summary>
- /// Initializes a new instance of the <see cref="CMSPluginDbMigrationService"/> class.
- /// </summary>
- /// <param name="dataSeeder">The data seeder.</param>
- /// <param name="dbSchemaMigrators">The database schema migrators.</param>
- /// <param name="logger">The logger.</param>
- public CMSPluginDbMigrationService(IDataSeeder dataSeeder,
- IEnumerable<ICMSPluginDbSchemaMigrator> dbSchemaMigrators, ILogger<CMSPluginDbMigrationService> logger)
- {
- _dataSeeder = dataSeeder;
- _dbSchemaMigrators = dbSchemaMigrators;
- _logger = logger;
- }
-
- /// <summary>
- /// Migrates the asynchronous.
- /// </summary>
- public async Task MigrateAsync()
- {
- var initialMigrationAdded = AddInitialMigrationIfNotExist();
-
- if (initialMigrationAdded)
- {
- return;
- }
-
- _logger.LogDebug("Started database migrations...");
-
- await MigrateDatabaseSchemaAsync();
- await SeedDataAsync();
-
- _logger.LogDebug($"Successfully completed host database migrations.");
- _logger.LogDebug("You can safely end this process...");
- }
-
- /// <summary>
- /// Migrates the database schema asynchronous.
- /// </summary>
- private async Task MigrateDatabaseSchemaAsync()
- {
- _logger.LogDebug($"Migrating schema for database...");
-
- foreach (var migrator in _dbSchemaMigrators)
- {
- await migrator.MigrateAsync();
- }
- }
-
- /// <summary>
- /// Seeds the data asynchronous.
- /// </summary>
- private async Task SeedDataAsync()
- {
- _logger.LogDebug($"Executing database seed...");
-
- await _dataSeeder.SeedAsync(new DataSeedContext().WithProperty(CMSPluginDbProperties.ConnectionStringName, CMSPluginDbProperties.ConnectionStringName));
- }
-
- /// <summary>
- /// Adds the initial migration if not exist.
- /// </summary>
- /// <returns></returns>
- private bool AddInitialMigrationIfNotExist()
- {
- try
- {
- if (!DbMigrationsProjectExists())
- {
- return false;
- }
- }
- catch (Exception)
- {
- return false;
- }
-
- try
- {
- if (!MigrationsFolderExists())
- {
- AddInitialMigration();
- return true;
- }
- else
- {
- return false;
- }
- }
- catch (Exception e)
- {
- _logger.LogWarning("Couldn't determinate if any migrations exist : " + e.Message);
- return false;
- }
- }
-
- /// <summary>
- /// Databases the migrations project exists.
- /// </summary>
- /// <returns></returns>
- private bool DbMigrationsProjectExists()
- {
- var dbMigrationsProjectFolder = GetEntityFrameworkCoreProjectFolderPath();
-
- return dbMigrationsProjectFolder != null;
- }
-
- /// <summary>
- /// Migrationses the folder exists.
- /// </summary>
- /// <returns></returns>
- private bool MigrationsFolderExists()
- {
- var dbMigrationsProjectFolder = GetEntityFrameworkCoreProjectFolderPath();
-
- return Directory.Exists(Path.Combine(dbMigrationsProjectFolder, "Migrations"));
- }
-
- /// <summary>
- /// Adds the initial migration.
- /// </summary>
- /// <exception cref="System.Exception">Couldn't run ABP CLI...</exception>
- private void AddInitialMigration()
- {
- _logger.LogDebug("Creating initial migration...");
-
- string argumentPrefix;
- string fileName;
-
- if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX) || RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
- {
- argumentPrefix = "-c";
- fileName = "/bin/bash";
- }
- else
- {
- argumentPrefix = "/C";
- fileName = "cmd.exe";
- }
-
- var procStartInfo = new ProcessStartInfo(fileName,
- $"{argumentPrefix} \"abp create-migration-and-run-migrator \"{GetEntityFrameworkCoreProjectFolderPath()}\"\""
- );
-
- try
- {
- Process.Start(procStartInfo);
- }
- catch (Exception)
- {
- throw new Exception("Couldn't run ABP CLI...");
- }
- }
-
- /// <summary>
- /// Gets the entity framework core project folder path.
- /// </summary>
- /// <returns></returns>
- /// <exception cref="System.Exception">Solution folder not found!</exception>
- private string GetEntityFrameworkCoreProjectFolderPath()
- {
- var slnDirectoryPath = GetSolutionDirectoryPath();
-
- if (slnDirectoryPath == null)
- {
- throw new Exception("Solution folder not found!");
- }
-
- var srcDirectoryPath = Path.Combine(slnDirectoryPath, "src");
-
- return Directory.GetDirectories(srcDirectoryPath)
- .FirstOrDefault(d => d.EndsWith(".EntityFrameworkCore"));
- }
-
- /// <summary>
- /// Gets the solution directory path.
- /// </summary>
- /// <returns></returns>
- private string GetSolutionDirectoryPath()
- {
- var currentDirectory = new DirectoryInfo(Directory.GetCurrentDirectory());
-
- while (Directory.GetParent(currentDirectory.FullName) != null)
- {
- currentDirectory = Directory.GetParent(currentDirectory.FullName);
-
- if (Directory.GetFiles(currentDirectory.FullName).FirstOrDefault(f => f.EndsWith(".sln")) != null)
- {
- return currentDirectory.FullName;
- }
- }
-
- return null;
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/Data/ICMSPluginDapperRepository.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/Data/ICMSPluginDapperRepository.cs"
deleted file mode 100644
index 46138d6..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/Data/ICMSPluginDapperRepository.cs"
+++ /dev/null
@@ -1,22 +0,0 @@
-using System.Data;
-using Volo.Abp.DependencyInjection;
-
-namespace CMS.Plugin.HIAWms.Domain.Data;
-
-/// <summary>
-/// Dapper浠撳偍
-/// </summary>
-public interface ICMSPluginDapperRepository : ITransientDependency
-{
- /// <summary>
- /// Gets the database connection asynchronous.
- /// </summary>
- /// <returns></returns>
- Task<IDbConnection> GetDbConnectionAsync();
-
- /// <summary>
- /// Gets the database transaction asynchronous.
- /// </summary>
- /// <returns></returns>
- Task<IDbTransaction> GetDbTransactionAsync();
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/Data/ICMSPluginDbSchemaMigrator.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/Data/ICMSPluginDbSchemaMigrator.cs"
deleted file mode 100644
index 3cf932e..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/Data/ICMSPluginDbSchemaMigrator.cs"
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace CMS.Plugin.HIAWms.Domain.Data;
-
-/// <summary>
-/// 鏁版嵁搴撴灦鏋勮縼绉诲櫒
-/// </summary>
-public interface ICMSPluginDbSchemaMigrator
-{
- /// <summary>
- /// Migrates the asynchronous.
- /// </summary>
- Task MigrateAsync();
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/Data/NullCMSPluginDbSchemaMigrator.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/Data/NullCMSPluginDbSchemaMigrator.cs"
deleted file mode 100644
index 40660f2..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/Data/NullCMSPluginDbSchemaMigrator.cs"
+++ /dev/null
@@ -1,16 +0,0 @@
-using Volo.Abp.DependencyInjection;
-
-namespace CMS.Plugin.HIAWms.Domain.Data;
-
-/// <summary>
-/// This is used if database provider does't define
-/// ICMSDbSchemaMigrator implementation.
-/// </summary>
-public class NullCMSPluginDbSchemaMigrator : ICMSPluginDbSchemaMigrator, ITransientDependency
-{
- /// <inheritdoc />
- public Task MigrateAsync()
- {
- return Task.CompletedTask;
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/EventHandlers/WmsAreaEventHandler.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/EventHandlers/WmsAreaEventHandler.cs"
deleted file mode 100644
index 9300b96..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/EventHandlers/WmsAreaEventHandler.cs"
+++ /dev/null
@@ -1,17 +0,0 @@
-using CMS.Plugin.HIAWms.Domain.Shared.WmsAreas;
-using Volo.Abp.DependencyInjection;
-using Volo.Abp.EventBus.Distributed;
-
-namespace CMS.Plugin.HIAWms.Domain.EventHandlers;
-
-/// <summary>
-/// WmsArea浜嬩欢澶勭悊绋嬪簭
-/// </summary>
-public class WmsAreaEventHandler : IDistributedEventHandler<WmsAreaEto>, ITransientDependency
-{
- /// <inheritdoc />
- public Task HandleEventAsync(WmsAreaEto eventData)
- {
- return Task.CompletedTask;
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/EventHandlers/WmsContainerEventHandler.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/EventHandlers/WmsContainerEventHandler.cs"
deleted file mode 100644
index a14c949..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/EventHandlers/WmsContainerEventHandler.cs"
+++ /dev/null
@@ -1,17 +0,0 @@
-using CMS.Plugin.HIAWms.Domain.Shared.WmsContainers;
-using Volo.Abp.DependencyInjection;
-using Volo.Abp.EventBus.Distributed;
-
-namespace CMS.Plugin.HIAWms.Domain.EventHandlers;
-
-/// <summary>
-/// WmsContainer浜嬩欢澶勭悊绋嬪簭
-/// </summary>
-public class WmsContainerEventHandler : IDistributedEventHandler<WmsContainerEto>, ITransientDependency
-{
- /// <inheritdoc />
- public Task HandleEventAsync(WmsContainerEto eventData)
- {
- return Task.CompletedTask;
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/EventHandlers/WmsMaterialEventHandler.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/EventHandlers/WmsMaterialEventHandler.cs"
deleted file mode 100644
index 50ed96d..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/EventHandlers/WmsMaterialEventHandler.cs"
+++ /dev/null
@@ -1,17 +0,0 @@
-using CMS.Plugin.HIAWms.Domain.Shared.WmsMaterial;
-using Volo.Abp.DependencyInjection;
-using Volo.Abp.EventBus.Distributed;
-
-namespace CMS.Plugin.HIAWms.Domain.EventHandlers;
-
-/// <summary>
-/// WmsMaterial浜嬩欢澶勭悊绋嬪簭
-/// </summary>
-public class WmsMaterialEventHandler : IDistributedEventHandler<WmsMaterialEto>, ITransientDependency
-{
- /// <inheritdoc />
- public Task HandleEventAsync(WmsMaterialEto eventData)
- {
- return Task.CompletedTask;
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/EventHandlers/WmsPlaceEventHandler.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/EventHandlers/WmsPlaceEventHandler.cs"
deleted file mode 100644
index e325983..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/EventHandlers/WmsPlaceEventHandler.cs"
+++ /dev/null
@@ -1,17 +0,0 @@
-using CMS.Plugin.HIAWms.Domain.Shared.WmsPlaces;
-using Volo.Abp.DependencyInjection;
-using Volo.Abp.EventBus.Distributed;
-
-namespace CMS.Plugin.HIAWms.Domain.EventHandlers;
-
-/// <summary>
-/// WmsPlace浜嬩欢澶勭悊绋嬪簭
-/// </summary>
-public class WmsPlaceEventHandler : IDistributedEventHandler<WmsPlaceEto>, ITransientDependency
-{
- /// <inheritdoc />
- public Task HandleEventAsync(WmsPlaceEto eventData)
- {
- return Task.CompletedTask;
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/EventHandlers/WmsStoreEventHandler.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/EventHandlers/WmsStoreEventHandler.cs"
deleted file mode 100644
index 044db16..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/EventHandlers/WmsStoreEventHandler.cs"
+++ /dev/null
@@ -1,17 +0,0 @@
-using CMS.Plugin.HIAWms.Domain.Shared.WmsStores;
-using Volo.Abp.DependencyInjection;
-using Volo.Abp.EventBus.Distributed;
-
-namespace CMS.Plugin.HIAWms.Domain.EventHandlers;
-
-/// <summary>
-/// WmsStore浜嬩欢澶勭悊绋嬪簭
-/// </summary>
-public class WmsStoreEventHandler : IDistributedEventHandler<WmsStoreEto>, ITransientDependency
-{
- /// <inheritdoc />
- public Task HandleEventAsync(WmsStoreEto eventData)
- {
- return Task.CompletedTask;
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/Settings/CMSPluginSettingDefinitionProvider.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/Settings/CMSPluginSettingDefinitionProvider.cs"
deleted file mode 100644
index 6d2f9ee..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/Settings/CMSPluginSettingDefinitionProvider.cs"
+++ /dev/null
@@ -1,27 +0,0 @@
-using CMS.Plugin.HIAWms.Abstractions;
-using CMS.Plugin.HIAWms.Domain.Shared.Localization;
-using Volo.Abp.Localization;
-using Volo.Abp.Settings;
-
-namespace CMS.Plugin.HIAWms.Domain.Settings;
-
-/// <summary>
-/// 璁剧疆瀹氫箟鎻愪緵绋嬪簭
-/// </summary>
-public class CMSPluginSettingDefinitionProvider : SettingDefinitionProvider
-{
- public override void Define(ISettingDefinitionContext context)
- {
- context.Add(new SettingDefinition(CMSPluginHIAWmsSettings.PluginState, "1", L($"DisplayName:{CMSPluginHIAWmsSettings.PluginState}"), isInherited: true));
- }
-
- /// <summary>
- /// ls the specified name.
- /// </summary>
- /// <param name="name">The name.</param>
- /// <returns></returns>
- private static LocalizableString L(string name)
- {
- return LocalizableString.Create<HIAWmsResource>(name);
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/WmsAreas/IWmsAreaRepository.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/WmsAreas/IWmsAreaRepository.cs"
deleted file mode 100644
index caacf37..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/WmsAreas/IWmsAreaRepository.cs"
+++ /dev/null
@@ -1,61 +0,0 @@
-using Volo.Abp.Domain.Repositories;
-using Volo.Abp.Specifications;
-
-namespace CMS.Plugin.HIAWms.Domain.WmsAreas;
-
-/// <summary>
-/// WmsArea浠撳偍
-/// </summary>
-public interface IWmsAreaRepository : IBasicRepository<WmsArea, Guid>
-{
- /// <summary>
- /// Finds the by name asynchronous.
- /// </summary>
- /// <param name="name">The name.</param>
- /// <param name="cancellationToken">The cancellation token.</param>
- /// <returns></returns>
- Task<WmsArea> FindByNameAsync(string name, CancellationToken cancellationToken = default);
-
- /// <summary>
- /// Names the exist asynchronous.
- /// </summary>
- /// <param name="name">The name.</param>
- /// <param name="id">The identifier.</param>
- /// <returns></returns>
- Task<bool> NameExistAsync(string name, Guid? id = null);
-
- /// <summary>
- /// Gets the maximum sort asynchronous.
- /// </summary>
- /// <returns></returns>
- Task<int> GetMaxSortAsync();
-
- /// <summary>
- /// Gets the list asynchronous.
- /// </summary>
- /// <param name="sorting">The sorting.</param>
- /// <param name="maxResultCount">The maximum result count.</param>
- /// <param name="skipCount">The skip count.</param>
- /// <param name="filter">The filter.</param>
- /// <param name="specification">The specification.</param>
- /// <param name="includeDetails">if set to <c>true</c> [include details].</param>
- /// <param name="cancellationToken">The cancellation token.</param>
- /// <returns></returns>
- Task<List<WmsArea>> GetListAsync(WmsArea? area, string sorting = null, int maxResultCount = int.MaxValue, int skipCount = 0, string filter = null, Specification<WmsArea> specification = null, bool includeDetails = false, CancellationToken cancellationToken = default);
-
- /// <summary>
- /// 鑾峰彇搴撳尯鍒楄〃
- /// </summary>
- /// <param name="cancellationToken"></param>
- /// <returns></returns>
- Task<List<WmsArea>> GetListForSelectAsync(CancellationToken cancellationToken = default);
-
- /// <summary>
- /// Gets the count asynchronous.
- /// </summary>
- /// <param name="filter">The filter.</param>
- /// <param name="specification">The specification.</param>
- /// <param name="cancellationToken">The cancellation token.</param>
- /// <returns></returns>
- Task<long> GetCountAsync(WmsArea? area, string filter = null, Specification<WmsArea> specification = null, CancellationToken cancellationToken = default);
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/WmsAreas/WmsArea.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/WmsAreas/WmsArea.cs"
deleted file mode 100644
index 8241f87..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/WmsAreas/WmsArea.cs"
+++ /dev/null
@@ -1,91 +0,0 @@
-using CMS.Plugin.HIAWms.Domain.Shared.Enums;
-using CMS.Plugin.HIAWms.Domain.Shared.WmsAreas;
-using Microsoft.EntityFrameworkCore.Metadata.Internal;
-using System.ComponentModel.DataAnnotations;
-using Volo.Abp;
-using Volo.Abp.Domain.Entities.Auditing;
-
-namespace CMS.Plugin.HIAWms.Domain.WmsAreas
-{
- /// <summary>
- /// WmsArea
- /// </summary>
- public class WmsArea : FullAuditedAggregateRoot<Guid>
- {
- /// <summary>
- /// 搴撳尯缂栧彿
- /// </summary>
- public string AreaNo { get; set; }
-
- /// <summary>
- /// 搴撳尯鍚嶇О
- /// </summary>
- public string AreaName { get; set; }
-
- /// <summary>
- /// 鎻忚堪
- /// </summary>
- public string? AreaDesc { get; set; }
-
- /// <summary>
- /// 搴撳尯鐘舵��
- /// </summary>
- public AreaStatusEnum AreaStatus { get; set; }
-
- /// <summary>
- /// 搴撳尯绫诲瀷
- /// </summary>
- public AreaTypeEnum AreaType { get; set; }
-
-
- /// <summary>
- /// 鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ��
- /// </summary>
- public string RedundantField1 { get; set; }
-
- /// <summary>
- /// 鍐椾綑瀛楁2 - 棰勭暀鎵╁睍鐢ㄩ��
- /// </summary>
- public string RedundantField2 { get; set; }
-
- /// <summary>
- /// 鍐椾綑瀛楁3 - 棰勭暀鎵╁睍鐢ㄩ��
- /// </summary>
- public string RedundantField3 { get; set; }
-
-
- /// <summary>
- /// 浠撳簱浠ｇ爜
- /// </summary>
- public string? StoreCode { get; set; }
-
- /// <summary>
- /// 浠撳簱鍚嶇О
- /// </summary>
- public string? StoreName { get; set; }
- /// <summary>
- /// 鎺掑簭
- /// </summary>
- public virtual int Sort { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- public virtual string Remark { get; set; }
-
- /// <summary>
- /// 鏄惁绂佺敤
- /// </summary>
- public virtual bool? IsDisabled { get; set; }
-
- /// <summary>
- /// Adjusts the sort.
- /// </summary>
- /// <param name="sort">The sort.</param>
- public void AdjustSort(int sort)
- {
- Sort = sort;
- }
-
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/WmsAreas/WmsAreaDataSeedContributor.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/WmsAreas/WmsAreaDataSeedContributor.cs"
deleted file mode 100644
index ae909d8..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/WmsAreas/WmsAreaDataSeedContributor.cs"
+++ /dev/null
@@ -1,67 +0,0 @@
-using Volo.Abp.Data;
-using Volo.Abp.DependencyInjection;
-using Volo.Abp.Guids;
-using Volo.Abp.Uow;
-
-namespace CMS.Plugin.HIAWms.Domain.WmsAreas
-{
- /// <summary>
- /// WmsArea绉嶅瓙鏁版嵁鎻愪緵绋嬪簭
- /// </summary>
- public class WmsAreaDataSeedContributor : IDataSeedContributor, ITransientDependency
- {
- private readonly IUnitOfWorkManager _unitOfWorkManager;
- private readonly IWmsAreaRepository _wmsareaRepository;
- private readonly IGuidGenerator _guidGenerator;
-
- /// <summary>
- /// Initializes a new instance of the <see cref="WmsAreaDataSeedContributor"/> class.
- /// </summary>
- /// <param name="unitOfWorkManager">The unit of work manager.</param>
- /// <param name="guidGenerator">The unique identifier generator.</param>
- /// <param name="wmsareaRepository">The work section repository.</param>
- public WmsAreaDataSeedContributor(IUnitOfWorkManager unitOfWorkManager, IGuidGenerator guidGenerator, IWmsAreaRepository wmsareaRepository)
- {
- _unitOfWorkManager = unitOfWorkManager;
- _wmsareaRepository = wmsareaRepository;
- _guidGenerator = guidGenerator;
- }
-
- /// <inheritdoc />
- public async Task SeedAsync(DataSeedContext context)
- {
- if (context.Properties.ContainsKey(CMSPluginDbProperties.ConnectionStringName) && context.Properties[CMSPluginDbProperties.ConnectionStringName]?.ToString() == CMSPluginDbProperties.ConnectionStringName)
- {
- try
- {
- //using var unitofWork = _unitOfWorkManager.Begin(requiresNew: true);
- //await unitofWork.SaveChangesAsync();
- }
- catch (Exception ex)
- {
- Console.WriteLine(ex.Message);
- }
- }
-
- if (context.Properties.ContainsKey("SeedTestData") && context.Properties["SeedTestData"]?.ToString() == "SeedTestData")
- {
- try
- {
- await SeedWmsAreaDataAsync();
- }
- catch (Exception e)
- {
- Console.WriteLine(e.Message);
- }
- }
- }
-
- /// <summary>
- /// Seeds the work section data asynchronous.
- /// </summary>
- private async Task SeedWmsAreaDataAsync()
- {
-
- }
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/WmsAreas/WmsAreaSpecification.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/WmsAreas/WmsAreaSpecification.cs"
deleted file mode 100644
index 625de4a..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/WmsAreas/WmsAreaSpecification.cs"
+++ /dev/null
@@ -1,41 +0,0 @@
-using System.Linq.Expressions;
-
-namespace CMS.Plugin.HIAWms.Domain.WmsAreas
-{
- /// <summary>
- /// WmsArea瑙勭害
- /// </summary>
- public class WmsAreaSpecification : Volo.Abp.Specifications.Specification<WmsArea>
- {
- private readonly string _areaCode;
-
- /// <summary>
- /// Initializes a new instance of the <see cref="WmsAreaSpecification"/> class.
- /// </summary>
- public WmsAreaSpecification()
- {
- }
-
- /// <summary>
- /// Initializes a new instance of the <see cref="WmsAreaSpecification"/> class.
- /// </summary>
- /// <param name="areaCode">The name.</param>
- public WmsAreaSpecification(string areaCode = null)
- {
- _areaCode = areaCode;
- }
-
- /// <inheritdoc />
- public override Expression<Func<WmsArea, bool>> ToExpression()
- {
- Expression<Func<WmsArea, bool>> expression = c => 1 == 1;
-
- if (_areaCode != null)
- {
- expression = expression.And(c => c.AreaNo == _areaCode);
- }
-
- return expression;
- }
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/WmsContainers/IWmsContainerRepository.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/WmsContainers/IWmsContainerRepository.cs"
deleted file mode 100644
index 50b4374..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/WmsContainers/IWmsContainerRepository.cs"
+++ /dev/null
@@ -1,54 +0,0 @@
-using Volo.Abp.Domain.Repositories;
-using Volo.Abp.Specifications;
-
-namespace CMS.Plugin.HIAWms.Domain.WmsContainers;
-
-/// <summary>
-/// WmsContainer浠撳偍
-/// </summary>
-public interface IWmsContainerRepository : IBasicRepository<WmsContainer, Guid>
-{
- /// <summary>
- /// Finds the by name asynchronous.
- /// </summary>
- /// <param name="name">The name.</param>
- /// <param name="cancellationToken">The cancellation token.</param>
- /// <returns></returns>
- Task<WmsContainer> FindByNameAsync(string name, CancellationToken cancellationToken = default);
-
- /// <summary>
- /// Names the exist asynchronous.
- /// </summary>
- /// <param name="name">The name.</param>
- /// <param name="id">The identifier.</param>
- /// <returns></returns>
- Task<bool> NameExistAsync(string name, Guid? id = null);
-
- /// <summary>
- /// Gets the maximum sort asynchronous.
- /// </summary>
- /// <returns></returns>
- Task<int> GetMaxSortAsync();
-
- /// <summary>
- /// Gets the list asynchronous.
- /// </summary>
- /// <param name="sorting">The sorting.</param>
- /// <param name="maxResultCount">The maximum result count.</param>
- /// <param name="skipCount">The skip count.</param>
- /// <param name="filter">The filter.</param>
- /// <param name="specification">The specification.</param>
- /// <param name="includeDetails">if set to <c>true</c> [include details].</param>
- /// <param name="cancellationToken">The cancellation token.</param>
- /// <returns></returns>
- Task<List<WmsContainer>> GetListAsync(WmsContainer? container, string sorting = null, int maxResultCount = int.MaxValue, int skipCount = 0, string filter = null, Specification<WmsContainer> specification = null, bool includeDetails = false, CancellationToken cancellationToken = default);
-
- /// <summary>
- /// Gets the count asynchronous.
- /// </summary>
- /// <param name="filter">The filter.</param>
- /// <param name="specification">The specification.</param>
- /// <param name="cancellationToken">The cancellation token.</param>
- /// <returns></returns>
- Task<long> GetCountAsync(WmsContainer? container, string filter = null, Specification<WmsContainer> specification = null, CancellationToken cancellationToken = default);
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/WmsContainers/WmsContainer.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/WmsContainers/WmsContainer.cs"
deleted file mode 100644
index d12e65a..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/WmsContainers/WmsContainer.cs"
+++ /dev/null
@@ -1,117 +0,0 @@
-using CMS.Plugin.HIAWms.Domain.Shared.Enums;
-using CMS.Plugin.HIAWms.Domain.Shared.WmsContainers;
-using Volo.Abp;
-using Volo.Abp.Domain.Entities.Auditing;
-
-namespace CMS.Plugin.HIAWms.Domain.WmsContainers
-{
- /// <summary>
- /// WmsContainer
- /// </summary>
- public class WmsContainer : FullAuditedAggregateRoot<Guid>
- {
- /// <summary>
- /// ID
- /// </summary>
- public Guid Id { get; set; }
- /// <summary>
- /// 鎵樼洏缂栧彿
- /// </summary>
- public string ContainerNo { get; set; }
-
- /// <summary>
- /// 鎵樼洏绫诲瀷
- /// </summary>
- public ContainerTypeEnum ContainerType { get; set; }
-
- /// <summary>
- /// 鎵樼洏鐘舵��
- /// </summary>
- public ContainerStatusEnum ContainerStatus { get; set; }
-
- /// <summary>
- /// 闀垮害
- /// </summary>
- public decimal? SpecLength { get; set; }
-
- /// <summary>
- /// 瀹藉害
- /// </summary>
- public decimal? SpecWidth { get; set; }
-
- /// <summary>
- /// 楂樺害
- /// </summary>
- public decimal? SpecHeight { get; set; }
-
- /// <summary>
- /// 闄愰暱
- /// </summary>
- public decimal? LimitLength { get; set; }
-
- /// <summary>
- /// 闄愬
- /// </summary>
- public decimal? LimitWidth { get; set; }
-
- /// <summary>
- /// 闄愰珮
- /// </summary>
- public decimal? LimitHeight { get; set; }
-
- /// <summary>
- /// 杞介噸涓婇檺
- /// </summary>
- public decimal? MaxWeight { get; set; }
-
- /// <summary>
- /// 寮傚父鏁伴噺
- /// </summary>
- public int? ExceptionNumber { get; set; }
-
- /// <summary>
- ///鐗╂枡鏁伴噺
- /// </summary>
- public int? MaterialNumber { get; set; }
-
- /// <summary>
- /// 鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ��
- /// </summary>
- public string RedundantField1 { get; set; }
-
- /// <summary>
- /// 鍐椾綑瀛楁2 - 棰勭暀鎵╁睍鐢ㄩ��
- /// </summary>
- public string RedundantField2 { get; set; }
-
- /// <summary>
- /// 鍐椾綑瀛楁3 - 棰勭暀鎵╁睍鐢ㄩ��
- /// </summary>
- public string RedundantField3 { get; set; }
-
- /// <summary>
- /// 鎺掑簭
- /// </summary>
- public virtual int Sort { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- public virtual string Remark { get; set; }
-
- /// <summary>
- /// 鏄惁绂佺敤
- /// </summary>
- public virtual bool? IsDisabled { get; set; }
-
- /// <summary>
- /// Adjusts the sort.
- /// </summary>
- /// <param name="sort">The sort.</param>
- public void AdjustSort(int sort)
- {
- Sort = sort;
- }
-
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/WmsContainers/WmsContainerDataSeedContributor.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/WmsContainers/WmsContainerDataSeedContributor.cs"
deleted file mode 100644
index dcfabe5..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/WmsContainers/WmsContainerDataSeedContributor.cs"
+++ /dev/null
@@ -1,67 +0,0 @@
-using Volo.Abp.Data;
-using Volo.Abp.DependencyInjection;
-using Volo.Abp.Guids;
-using Volo.Abp.Uow;
-
-namespace CMS.Plugin.HIAWms.Domain.WmsContainers
-{
- /// <summary>
- /// WmsContainer绉嶅瓙鏁版嵁鎻愪緵绋嬪簭
- /// </summary>
- public class WmsContainerDataSeedContributor : IDataSeedContributor, ITransientDependency
- {
- private readonly IUnitOfWorkManager _unitOfWorkManager;
- private readonly IWmsContainerRepository _wmscontainerRepository;
- private readonly IGuidGenerator _guidGenerator;
-
- /// <summary>
- /// Initializes a new instance of the <see cref="WmsContainerDataSeedContributor"/> class.
- /// </summary>
- /// <param name="unitOfWorkManager">The unit of work manager.</param>
- /// <param name="guidGenerator">The unique identifier generator.</param>
- /// <param name="wmscontainerRepository">The work section repository.</param>
- public WmsContainerDataSeedContributor(IUnitOfWorkManager unitOfWorkManager, IGuidGenerator guidGenerator, IWmsContainerRepository wmscontainerRepository)
- {
- _unitOfWorkManager = unitOfWorkManager;
- _wmscontainerRepository = wmscontainerRepository;
- _guidGenerator = guidGenerator;
- }
-
- /// <inheritdoc />
- public async Task SeedAsync(DataSeedContext context)
- {
- if (context.Properties.ContainsKey(CMSPluginDbProperties.ConnectionStringName) && context.Properties[CMSPluginDbProperties.ConnectionStringName]?.ToString() == CMSPluginDbProperties.ConnectionStringName)
- {
- try
- {
- //using var unitofWork = _unitOfWorkManager.Begin(requiresNew: true);
- //await unitofWork.SaveChangesAsync();
- }
- catch (Exception ex)
- {
- Console.WriteLine(ex.Message);
- }
- }
-
- if (context.Properties.ContainsKey("SeedTestData") && context.Properties["SeedTestData"]?.ToString() == "SeedTestData")
- {
- try
- {
- await SeedWmsContainerDataAsync();
- }
- catch (Exception e)
- {
- Console.WriteLine(e.Message);
- }
- }
- }
-
- /// <summary>
- /// Seeds the work section data asynchronous.
- /// </summary>
- private async Task SeedWmsContainerDataAsync()
- {
-
- }
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/WmsContainers/WmsContainerSpecification.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/WmsContainers/WmsContainerSpecification.cs"
deleted file mode 100644
index cdff594..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/WmsContainers/WmsContainerSpecification.cs"
+++ /dev/null
@@ -1,41 +0,0 @@
-using System.Linq.Expressions;
-
-namespace CMS.Plugin.HIAWms.Domain.WmsContainers
-{
- /// <summary>
- /// WmsContainer瑙勭害
- /// </summary>
- public class WmsContainerSpecification : Volo.Abp.Specifications.Specification<WmsContainer>
- {
- private readonly string _containerNo;
-
- /// <summary>
- /// Initializes a new instance of the <see cref="WmsContainerSpecification"/> class.
- /// </summary>
- public WmsContainerSpecification()
- {
- }
-
- /// <summary>
- /// Initializes a new instance of the <see cref="WmsContainerSpecification"/> class.
- /// </summary>
- /// <param name="containerNo">The name.</param>
- public WmsContainerSpecification(string containerNo = null)
- {
- _containerNo = containerNo;
- }
-
- /// <inheritdoc />
- public override Expression<Func<WmsContainer, bool>> ToExpression()
- {
- Expression<Func<WmsContainer, bool>> expression = c => 1 == 1;
-
- if (_containerNo != null)
- {
- expression = expression.And(c => c.ContainerNo == _containerNo);
- }
-
- return expression;
- }
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/WmsInOutStockRecord/IWmsInOutStockRecordRepository.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/WmsInOutStockRecord/IWmsInOutStockRecordRepository.cs"
deleted file mode 100644
index d1d3f69..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/WmsInOutStockRecord/IWmsInOutStockRecordRepository.cs"
+++ /dev/null
@@ -1,53 +0,0 @@
-using CmsQueryExtensions.Extension;
-using System.Linq.Expressions;
-using Volo.Abp.Domain.Repositories;
-
-namespace CMS.Plugin.HIAWms.Domain.WmsInOutStockRecord;
-
-/// <summary>
-/// 鍑哄叆搴撹褰曡〃浠撳偍
-/// </summary>
-public interface IWmsInOutStockRecordRepository : IBasicRepository<WmsInOutStockRecord, Guid>
-{
- /// <summary>
- /// 鎸夌収鍚嶇О鏌ユ壘鍑哄叆搴撹褰曡〃
- /// </summary>
- /// <param name="name"></param>
- /// <param name="cancellationToken"></param>
- /// <returns></returns>
- Task<WmsInOutStockRecord> FindByNameAsync(string name, CancellationToken cancellationToken = default);
-
- /// <summary>
- /// 楠岃瘉鍚嶇О鏄惁瀛樺湪鍑哄叆搴撹褰曡〃
- /// </summary>
- /// <param name="name"></param>
- /// <param name="id"></param>
- /// <returns></returns>
- Task<bool> NameExistAsync(string name, Guid? id = null);
-
- /// <summary>
- /// 鑾峰彇鏈�澶ф帓搴忓嚭鍏ュ簱璁板綍琛�
- /// </summary>
- /// <returns></returns>
- Task<int> GetMaxSortAsync();
-
- /// <summary>
- /// 鑾峰彇鍒嗛〉鍒楄〃鍑哄叆搴撹褰曡〃
- /// </summary>
- /// <param name="whereConditions"></param>
- /// <param name="sorting"></param>
- /// <param name="maxResultCount"></param>
- /// <param name="skipCount"></param>
- /// <param name="includeDetails"></param>
- /// <param name="cancellationToken"></param>
- /// <returns></returns>
- Task<List<WmsInOutStockRecord>> GetListAsync(FunReturnResultModel<Expression<Func<WmsInOutStockRecord, bool>>> whereConditions, string sorting = null, int maxResultCount = int.MaxValue, int skipCount = 0, bool includeDetails = false, CancellationToken cancellationToken = default);
-
- /// <summary>
- /// 鑾峰彇鎬绘暟鍑哄叆搴撹褰曡〃
- /// </summary>
- /// <param name="whereConditions"></param>
- /// <param name="cancellationToken"></param>
- /// <returns></returns>
- Task<long> GetCountAsync(FunReturnResultModel<Expression<Func<WmsInOutStockRecord, bool>>> whereConditions, CancellationToken cancellationToken = default);
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/WmsInOutStockRecord/WmsInOutStockRecord.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/WmsInOutStockRecord/WmsInOutStockRecord.cs"
deleted file mode 100644
index ac5a066..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/WmsInOutStockRecord/WmsInOutStockRecord.cs"
+++ /dev/null
@@ -1,95 +0,0 @@
-锘縰sing CMS.Plugin.HIAWms.Domain.Shared.Enums;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Volo.Abp.Domain.Entities.Auditing;
-
-namespace CMS.Plugin.HIAWms.Domain.WmsInOutStockRecord
-{
- /// <summary>
- /// 鍑哄叆搴撹褰�.
- /// </summary>
- public class WmsInOutStockRecord : FullAuditedAggregateRoot<Guid>
- {
- /// <summary>
- /// 鍗曟嵁缂栧彿
- /// </summary>
- public string OrderNo { get; set; }
-
- /// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
- public string? MaterialName { get; set; }
-
- /// <summary>
- /// 鐗╂枡浠跺彿
- /// </summary>
- public string MaterialNo { get; set; }
-
- /// <summary>
- /// 鎿嶄綔绫诲瀷
- /// </summary>
- public StockTypeEnum StockType { get; set; }
-
- /// <summary>
- /// 瀹瑰櫒缂栧彿.
- /// </summary>
- public string? ContainerNo { get; set; }
-
- /// <summary>
- /// 鍨嬪彿
- /// </summary>
- public string? MaterialModel { get; set; }
-
- /// <summary>
- /// 鎿嶄綔鏃堕棿
- /// </summary>
- public DateTime? OperateTime { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- public string? Remark { get; set; }
-
- /// <summary>
- /// 鐗╂枡ID
- /// </summary>
- public string MaterialId { get; set; }
-
- /// <summary>
- /// 浠诲姟鍙�
- /// </summary>
- public string TaskNo { get; set; }
-
- /// <summary>
- /// 璧峰搴撲綅
- /// </summary>
- public string? SourcePlace { get; set; }
-
- /// <summary>
- /// 鐩爣搴撲綅
- /// </summary>
- public string? ToPlace { get; set; }
-
- /// <summary>
- /// 鎺掑簭
- /// </summary>
- public virtual int Sort { get; set; }
-
- /// <summary>
- /// 鏄惁绂佺敤
- /// </summary>
- public virtual bool? IsDisabled { get; set; }
-
- /// <summary>
- /// Adjusts the sort.
- /// </summary>
- /// <param name="sort">The sort.</param>
- public void AdjustSort(int sort)
- {
- Sort = sort;
- }
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/WmsMaterial/IWmsMaterialRepository.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/WmsMaterial/IWmsMaterialRepository.cs"
deleted file mode 100644
index b6ce9c7..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/WmsMaterial/IWmsMaterialRepository.cs"
+++ /dev/null
@@ -1,53 +0,0 @@
-using CmsQueryExtensions.Extension;
-using System.Linq.Expressions;
-using Volo.Abp.Domain.Repositories;
-
-namespace CMS.Plugin.HIAWms.Domain.WmsMaterial;
-
-/// <summary>
-/// 鐗╂枡鍩虹淇℃伅琛ㄤ粨鍌�
-/// </summary>
-public interface IWmsMaterialRepository : IBasicRepository<WmsMaterial, Guid>
-{
- /// <summary>
- /// 鎸夌収鍚嶇О鏌ユ壘鐗╂枡鍩虹淇℃伅琛�
- /// </summary>
- /// <param name="name"></param>
- /// <param name="cancellationToken"></param>
- /// <returns></returns>
- Task<WmsMaterial> FindByNameAsync(string name, CancellationToken cancellationToken = default);
-
- /// <summary>
- /// 楠岃瘉鍚嶇О鏄惁瀛樺湪鐗╂枡鍩虹淇℃伅琛�
- /// </summary>
- /// <param name="name"></param>
- /// <param name="id"></param>
- /// <returns></returns>
- Task<bool> NameExistAsync(string name, Guid? id = null);
-
- /// <summary>
- /// 鑾峰彇鏈�澶ф帓搴忕墿鏂欏熀纭�淇℃伅琛�
- /// </summary>
- /// <returns></returns>
- Task<int> GetMaxSortAsync();
-
- /// <summary>
- /// 鑾峰彇鍒嗛〉鍒楄〃鐗╂枡鍩虹淇℃伅琛�
- /// </summary>
- /// <param name="whereConditions"></param>
- /// <param name="sorting"></param>
- /// <param name="maxResultCount"></param>
- /// <param name="skipCount"></param>
- /// <param name="includeDetails"></param>
- /// <param name="cancellationToken"></param>
- /// <returns></returns>
- Task<List<WmsMaterial>> GetListAsync(FunReturnResultModel<Expression<Func<WmsMaterial, bool>>> whereConditions, string sorting = null, int maxResultCount = int.MaxValue, int skipCount = 0, bool includeDetails = false, CancellationToken cancellationToken = default);
-
- /// <summary>
- /// 鑾峰彇鎬绘暟鐗╂枡鍩虹淇℃伅琛�
- /// </summary>
- /// <param name="whereConditions"></param>
- /// <param name="cancellationToken"></param>
- /// <returns></returns>
- Task<long> GetCountAsync(FunReturnResultModel<Expression<Func<WmsMaterial, bool>>> whereConditions, CancellationToken cancellationToken = default);
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/WmsMaterial/WmsMaterial.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/WmsMaterial/WmsMaterial.cs"
deleted file mode 100644
index eee2ed5..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/WmsMaterial/WmsMaterial.cs"
+++ /dev/null
@@ -1,119 +0,0 @@
-using CMS.Plugin.HIAWms.Domain.Shared.Enums;
-using CMS.Plugin.HIAWms.Domain.Shared.WmsMaterial;
-using MathNet.Numerics;
-using Volo.Abp;
-using Volo.Abp.Domain.Entities.Auditing;
-
-namespace CMS.Plugin.HIAWms.Domain.WmsMaterial
-{
- /// <summary>
- /// WmsMaterial
- /// </summary>
- public class WmsMaterial : FullAuditedAggregateRoot<Guid>
- {
- /// <summary>
- /// 鐗╂枡缂栫爜锛堝敮涓�鏍囪瘑锛�
- /// </summary>
- public string MaterialCode { get; set; }
-
- /// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
- public string MaterialName { get; set; }
-
- /// <summary>
- /// 閲囪喘绫诲瀷锛堟灇涓惧�硷級
- /// </summary>
- public PurchaseTypeEnum PurchaseType { get; set; }
-
- /// <summary>
- /// 鐗╂枡绫诲瀷锛堟灇涓惧�硷級
- /// </summary>
- public MaterialTypeEnum MaterialType { get; set; }
-
- /// <summary>
- /// 涓诲崟浣嶏紙濡傦細kg銆乵銆佷釜锛�
- /// </summary>
- public string PrimaryUnit { get; set; }
-
- /// <summary>
- /// 瑙勬牸/鏍囧噯锛堝锛欸B/T 8163-2018锛�
- /// </summary>
- public string Standard { get; set; }
-
- /// <summary>
- /// 澶栧緞锛堝崟浣嶏細mm锛�
- /// </summary>
- public decimal OuterDiameter { get; set; }
-
- /// <summary>
- /// 澹佸帤锛堝崟浣嶏細mm锛�
- /// </summary>
- public decimal WallThickness { get; set; }
-
- /// <summary>
- /// 鏉愯川锛堝锛�304涓嶉攬閽級
- /// </summary>
- public string MaterialQuality { get; set; }
-
- /// <summary>
- /// 闀垮害锛堝崟浣嶏細m锛�
- /// </summary>
- public decimal Length { get; set; }
-
- /// <summary>
- /// 鏄惁涓轰富鏀锛坱rue: 涓绘敮绠�, false: 闈炰富鏀锛�
- /// </summary>
- public YesNoEnum IsMainBranch { get; set; }
-
- /// <summary>
- /// 鐢熶骇宸ュ巶
- /// </summary>
- public string Factory { get; set; }
-
- /// <summary>
- /// 璇佷功缂栧彿锛堝锛氬帇鍔涘鍣ㄨ璇侊級
- /// </summary>
- public string Certification { get; set; }
-
- /// <summary>
- /// 鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ��
- /// </summary>
- public string RedundantField1 { get; set; }
-
- /// <summary>
- /// 鍐椾綑瀛楁2 - 棰勭暀鎵╁睍鐢ㄩ��
- /// </summary>
- public string RedundantField2 { get; set; }
-
- /// <summary>
- /// 鍐椾綑瀛楁3 - 棰勭暀鎵╁睍鐢ㄩ��
- /// </summary>
- public string RedundantField3 { get; set; }
-
- /// <summary>
- /// 鎺掑簭
- /// </summary>
- public virtual int Sort { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- public virtual string Remark { get; set; }
-
- /// <summary>
- /// 鏄惁绂佺敤
- /// </summary>
- public virtual bool? IsDisabled { get; set; }
-
- /// <summary>
- /// Adjusts the sort.
- /// </summary>
- /// <param name="sort">The sort.</param>
- public void AdjustSort(int sort)
- {
- Sort = sort;
- }
-
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/WmsMaterial/WmsMaterialDataSeedContributor.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/WmsMaterial/WmsMaterialDataSeedContributor.cs"
deleted file mode 100644
index c7dfba5..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/WmsMaterial/WmsMaterialDataSeedContributor.cs"
+++ /dev/null
@@ -1,67 +0,0 @@
-using Volo.Abp.Data;
-using Volo.Abp.DependencyInjection;
-using Volo.Abp.Guids;
-using Volo.Abp.Uow;
-
-namespace CMS.Plugin.HIAWms.Domain.WmsMaterial
-{
- /// <summary>
- /// WmsMaterial绉嶅瓙鏁版嵁鎻愪緵绋嬪簭
- /// </summary>
- public class WmsMaterialDataSeedContributor : IDataSeedContributor, ITransientDependency
- {
- private readonly IUnitOfWorkManager _unitOfWorkManager;
- private readonly IWmsMaterialRepository _wmsmaterialRepository;
- private readonly IGuidGenerator _guidGenerator;
-
- /// <summary>
- /// Initializes a new instance of the <see cref="WmsMaterialDataSeedContributor"/> class.
- /// </summary>
- /// <param name="unitOfWorkManager">The unit of work manager.</param>
- /// <param name="guidGenerator">The unique identifier generator.</param>
- /// <param name="wmsmaterialRepository">The work section repository.</param>
- public WmsMaterialDataSeedContributor(IUnitOfWorkManager unitOfWorkManager, IGuidGenerator guidGenerator, IWmsMaterialRepository wmsmaterialRepository)
- {
- _unitOfWorkManager = unitOfWorkManager;
- _wmsmaterialRepository = wmsmaterialRepository;
- _guidGenerator = guidGenerator;
- }
-
- /// <inheritdoc />
- public async Task SeedAsync(DataSeedContext context)
- {
- if (context.Properties.ContainsKey(CMSPluginDbProperties.ConnectionStringName) && context.Properties[CMSPluginDbProperties.ConnectionStringName]?.ToString() == CMSPluginDbProperties.ConnectionStringName)
- {
- try
- {
- //using var unitofWork = _unitOfWorkManager.Begin(requiresNew: true);
- //await unitofWork.SaveChangesAsync();
- }
- catch (Exception ex)
- {
- Console.WriteLine(ex.Message);
- }
- }
-
- if (context.Properties.ContainsKey("SeedTestData") && context.Properties["SeedTestData"]?.ToString() == "SeedTestData")
- {
- try
- {
- await SeedWmsMaterialDataAsync();
- }
- catch (Exception e)
- {
- Console.WriteLine(e.Message);
- }
- }
- }
-
- /// <summary>
- /// Seeds the work section data asynchronous.
- /// </summary>
- private async Task SeedWmsMaterialDataAsync()
- {
-
- }
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/WmsMaterial/WmsMaterialSpecification.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/WmsMaterial/WmsMaterialSpecification.cs"
deleted file mode 100644
index 10e3999..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/WmsMaterial/WmsMaterialSpecification.cs"
+++ /dev/null
@@ -1,41 +0,0 @@
-//using System.Linq.Expressions;
-
-//namespace CMS.Plugin.HIAWms.Domain.WmsMaterials
-//{
-// /// <summary>
-// /// WmsMaterial瑙勭害
-// /// </summary>
-// public class WmsMaterialSpecification : Volo.Abp.Specifications.Specification<WmsMaterial>
-// {
-// private readonly string _materialCode;
-
-// /// <summary>
-// /// Initializes a new instance of the <see cref="WmsMaterialSpecification"/> class.
-// /// </summary>
-// public WmsMaterialSpecification()
-// {
-// }
-
-// /// <summary>
-// /// Initializes a new instance of the <see cref="WmsMaterialSpecification"/> class.
-// /// </summary>
-// /// <param name="materialCode">The name.</param>
-// public WmsMaterialSpecification(string materialCode = null)
-// {
-// _materialCode = materialCode;
-// }
-
-// /// <inheritdoc />
-// public override Expression<Func<WmsMaterial, bool>> ToExpression()
-// {
-// Expression<Func<WmsMaterial, bool>> expression = c => 1 == 1;
-
-// if (_materialCode != null)
-// {
-// expression = expression.And(c => c.MaterialCode == _materialCode);
-// }
-
-// return expression;
-// }
-// }
-//}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/WmsPlaces/IWmsPlaceRepository.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/WmsPlaces/IWmsPlaceRepository.cs"
deleted file mode 100644
index b18102b..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/WmsPlaces/IWmsPlaceRepository.cs"
+++ /dev/null
@@ -1,54 +0,0 @@
-using Volo.Abp.Domain.Repositories;
-using Volo.Abp.Specifications;
-
-namespace CMS.Plugin.HIAWms.Domain.WmsPlaces;
-
-/// <summary>
-/// WmsPlace浠撳偍
-/// </summary>
-public interface IWmsPlaceRepository : IBasicRepository<WmsPlace, Guid>
-{
- /// <summary>
- /// Finds the by name asynchronous.
- /// </summary>
- /// <param name="name">The name.</param>
- /// <param name="cancellationToken">The cancellation token.</param>
- /// <returns></returns>
- Task<WmsPlace> FindByNameAsync(string name, CancellationToken cancellationToken = default);
-
- /// <summary>
- /// Names the exist asynchronous.
- /// </summary>
- /// <param name="name">The name.</param>
- /// <param name="id">The identifier.</param>
- /// <returns></returns>
- Task<bool> NameExistAsync(string name, Guid? id = null);
-
- /// <summary>
- /// Gets the maximum sort asynchronous.
- /// </summary>
- /// <returns></returns>
- Task<int> GetMaxSortAsync();
-
- /// <summary>
- /// Gets the list asynchronous.
- /// </summary>
- /// <param name="sorting">The sorting.</param>
- /// <param name="maxResultCount">The maximum result count.</param>
- /// <param name="skipCount">The skip count.</param>
- /// <param name="filter">The filter.</param>
- /// <param name="specification">The specification.</param>
- /// <param name="includeDetails">if set to <c>true</c> [include details].</param>
- /// <param name="cancellationToken">The cancellation token.</param>
- /// <returns></returns>
- Task<List<WmsPlace>> GetListAsync(WmsPlace? place, string sorting = null, int maxResultCount = int.MaxValue, int skipCount = 0, string filter = null, Specification<WmsPlace> specification = null, bool includeDetails = false, CancellationToken cancellationToken = default);
-
- /// <summary>
- /// Gets the count asynchronous.
- /// </summary>
- /// <param name="filter">The filter.</param>
- /// <param name="specification">The specification.</param>
- /// <param name="cancellationToken">The cancellation token.</param>
- /// <returns></returns>
- Task<long> GetCountAsync(WmsPlace? place, string filter = null, Specification<WmsPlace> specification = null, CancellationToken cancellationToken = default);
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/WmsPlaces/WmsPlace.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/WmsPlaces/WmsPlace.cs"
deleted file mode 100644
index c73bb3a..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/WmsPlaces/WmsPlace.cs"
+++ /dev/null
@@ -1,104 +0,0 @@
-using CMS.Plugin.HIAWms.Domain.Shared.Enums;
-using CMS.Plugin.HIAWms.Domain.Shared.WmsPlaces;
-using Volo.Abp;
-using Volo.Abp.Domain.Entities.Auditing;
-
-namespace CMS.Plugin.HIAWms.Domain.WmsPlaces
-{
- /// <summary>
- /// WmsPlace
- /// </summary>
- public class WmsPlace : FullAuditedAggregateRoot<Guid>
- {
- /// <summary>
- /// 缂栧彿
- /// </summary>
- public virtual string PlaceNo { get; set; }
-
- /// <summary>
- /// 璐т綅绫诲瀷
- /// </summary>
- public PlaceTypeEnum StorageTypeNo { get; set; }
-
- /// <summary>
- /// 璐т綅鐘舵��
- /// </summary>
- public PlaceStatusEnum PlaceStatus { get; set; }
-
- /// <summary>
- /// 鎵�鍦ㄥ簱鍖�
- /// </summary>
- public string AreaCode { get; set; }
-
- /// <summary>
- /// 宸烽亾
- /// </summary>
- public int Aisle { get; set; }
-
- /// <summary>
- /// 鎺�
- /// </summary>
- public int RowNo { get; set; }
-
- /// <summary>
- /// 鍒�
- /// </summary>
- public int ColumnNo { get; set; }
-
- /// <summary>
- /// 灞�
- /// </summary>
- public int LayerNo { get; set; }
-
- /// <summary>
- /// 鏄惁閿佸畾
- /// </summary>
- public YesNoEnum Islock { get; set; }
-
- /// <summary>
- /// 鏄惁绌烘墭
- /// </summary>
- public YesNoEnum EmptyContainer { get; set; }
-
- /// <summary>
- /// 鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ��
- /// </summary>
- public string RedundantField1 { get; set; }
-
- /// <summary>
- /// 鍐椾綑瀛楁2 - 棰勭暀鎵╁睍鐢ㄩ��
- /// </summary>
- public string RedundantField2 { get; set; }
-
- /// <summary>
- /// 鍐椾綑瀛楁3 - 棰勭暀鎵╁睍鐢ㄩ��
- /// </summary>
- public string RedundantField3 { get; set; }
-
-
- /// <summary>
- /// 鎺掑簭
- /// </summary>
- public virtual int Sort { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- public virtual string Remark { get; set; }
-
- /// <summary>
- /// 鏄惁绂佺敤
- /// </summary>
- public virtual bool? IsDisabled { get; set; }
-
- /// <summary>
- /// Adjusts the sort.
- /// </summary>
- /// <param name="sort">The sort.</param>
- public void AdjustSort(int sort)
- {
- Sort = sort;
- }
-
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/WmsPlaces/WmsPlaceDataSeedContributor.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/WmsPlaces/WmsPlaceDataSeedContributor.cs"
deleted file mode 100644
index b4f1e65..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/WmsPlaces/WmsPlaceDataSeedContributor.cs"
+++ /dev/null
@@ -1,67 +0,0 @@
-using Volo.Abp.Data;
-using Volo.Abp.DependencyInjection;
-using Volo.Abp.Guids;
-using Volo.Abp.Uow;
-
-namespace CMS.Plugin.HIAWms.Domain.WmsPlaces
-{
- /// <summary>
- /// WmsPlace绉嶅瓙鏁版嵁鎻愪緵绋嬪簭
- /// </summary>
- public class WmsPlaceDataSeedContributor : IDataSeedContributor, ITransientDependency
- {
- private readonly IUnitOfWorkManager _unitOfWorkManager;
- private readonly IWmsPlaceRepository _wmsplaceRepository;
- private readonly IGuidGenerator _guidGenerator;
-
- /// <summary>
- /// Initializes a new instance of the <see cref="WmsPlaceDataSeedContributor"/> class.
- /// </summary>
- /// <param name="unitOfWorkManager">The unit of work manager.</param>
- /// <param name="guidGenerator">The unique identifier generator.</param>
- /// <param name="wmsplaceRepository">The work section repository.</param>
- public WmsPlaceDataSeedContributor(IUnitOfWorkManager unitOfWorkManager, IGuidGenerator guidGenerator, IWmsPlaceRepository wmsplaceRepository)
- {
- _unitOfWorkManager = unitOfWorkManager;
- _wmsplaceRepository = wmsplaceRepository;
- _guidGenerator = guidGenerator;
- }
-
- /// <inheritdoc />
- public async Task SeedAsync(DataSeedContext context)
- {
- if (context.Properties.ContainsKey(CMSPluginDbProperties.ConnectionStringName) && context.Properties[CMSPluginDbProperties.ConnectionStringName]?.ToString() == CMSPluginDbProperties.ConnectionStringName)
- {
- try
- {
- //using var unitofWork = _unitOfWorkManager.Begin(requiresNew: true);
- //await unitofWork.SaveChangesAsync();
- }
- catch (Exception ex)
- {
- Console.WriteLine(ex.Message);
- }
- }
-
- if (context.Properties.ContainsKey("SeedTestData") && context.Properties["SeedTestData"]?.ToString() == "SeedTestData")
- {
- try
- {
- await SeedWmsPlaceDataAsync();
- }
- catch (Exception e)
- {
- Console.WriteLine(e.Message);
- }
- }
- }
-
- /// <summary>
- /// Seeds the work section data asynchronous.
- /// </summary>
- private async Task SeedWmsPlaceDataAsync()
- {
-
- }
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/WmsPlaces/WmsPlaceSpecification.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/WmsPlaces/WmsPlaceSpecification.cs"
deleted file mode 100644
index 752970c..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/WmsPlaces/WmsPlaceSpecification.cs"
+++ /dev/null
@@ -1,41 +0,0 @@
-using System.Linq.Expressions;
-
-namespace CMS.Plugin.HIAWms.Domain.WmsPlaces
-{
- /// <summary>
- /// WmsPlace瑙勭害
- /// </summary>
- public class WmsPlaceSpecification : Volo.Abp.Specifications.Specification<WmsPlace>
- {
- private readonly string _placeNo;
-
- /// <summary>
- /// Initializes a new instance of the <see cref="WmsPlaceSpecification"/> class.
- /// </summary>
- public WmsPlaceSpecification()
- {
- }
-
- /// <summary>
- /// Initializes a new instance of the <see cref="WmsPlaceSpecification"/> class.
- /// </summary>
- /// <param name="placeNo">The name.</param>
- public WmsPlaceSpecification(string placeNo = null)
- {
- _placeNo = placeNo;
- }
-
- /// <inheritdoc />
- public override Expression<Func<WmsPlace, bool>> ToExpression()
- {
- Expression<Func<WmsPlace, bool>> expression = c => 1 == 1;
-
- if (_placeNo != null)
- {
- expression = expression.And(c => c.PlaceNo == _placeNo);
- }
-
- return expression;
- }
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/WmsStores/IWmsStoreRepository.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/WmsStores/IWmsStoreRepository.cs"
deleted file mode 100644
index e843235..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/WmsStores/IWmsStoreRepository.cs"
+++ /dev/null
@@ -1,61 +0,0 @@
-using Volo.Abp.Domain.Repositories;
-using Volo.Abp.Specifications;
-
-namespace CMS.Plugin.HIAWms.Domain.WmsStores;
-
-/// <summary>
-/// WmsStore浠撳偍
-/// </summary>
-public interface IWmsStoreRepository : IBasicRepository<WmsStore, Guid>
-{
- /// <summary>
- /// Finds the by name asynchronous.
- /// </summary>
- /// <param name="name">The name.</param>
- /// <param name="cancellationToken">The cancellation token.</param>
- /// <returns></returns>
- Task<WmsStore> FindByNameAsync(string name, CancellationToken cancellationToken = default);
-
- /// <summary>
- /// Names the exist asynchronous.
- /// </summary>
- /// <param name="name">The name.</param>
- /// <param name="id">The identifier.</param>
- /// <returns></returns>
- Task<bool> NameExistAsync(string name, Guid? id = null);
-
- /// <summary>
- /// Gets the maximum sort asynchronous.
- /// </summary>
- /// <returns></returns>
- Task<int> GetMaxSortAsync();
-
- /// <summary>
- /// Gets the list asynchronous.
- /// </summary>
- /// <param name="sorting">The sorting.</param>
- /// <param name="maxResultCount">The maximum result count.</param>
- /// <param name="skipCount">The skip count.</param>
- /// <param name="filter">The filter.</param>
- /// <param name="specification">The specification.</param>
- /// <param name="includeDetails">if set to <c>true</c> [include details].</param>
- /// <param name="cancellationToken">The cancellation token.</param>
- /// <returns></returns>
- Task<List<WmsStore>> GetListAsync(WmsStore? store, string sorting = null, int maxResultCount = int.MaxValue, int skipCount = 0, string filter = null, Specification<WmsStore> specification = null, bool includeDetails = false, CancellationToken cancellationToken = default);
-
- /// <summary>
- /// 鏌ヨ浠撳簱鍒楄〃
- /// </summary>
- /// <param name="cancellationToken"></param>
- /// <returns></returns>
- Task<List<WmsStore>> GetListForSelectAsync(CancellationToken cancellationToken = default);
-
- /// <summary>
- /// Gets the count asynchronous.
- /// </summary>
- /// <param name="filter">The filter.</param>
- /// <param name="specification">The specification.</param>
- /// <param name="cancellationToken">The cancellation token.</param>
- /// <returns></returns>
- Task<long> GetCountAsync(WmsStore? store, string filter = null, Specification<WmsStore> specification = null, CancellationToken cancellationToken = default);
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/WmsStores/WmsStore.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/WmsStores/WmsStore.cs"
deleted file mode 100644
index ebed236..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/WmsStores/WmsStore.cs"
+++ /dev/null
@@ -1,64 +0,0 @@
-using CMS.Plugin.HIAWms.Domain.Shared.WmsStores;
-using Microsoft.EntityFrameworkCore.Metadata.Internal;
-using Volo.Abp;
-using Volo.Abp.Domain.Entities.Auditing;
-
-namespace CMS.Plugin.HIAWms.Domain.WmsStores
-{
- /// <summary>
- /// WmsStore
- /// </summary>
- public class WmsStore : FullAuditedAggregateRoot<Guid>
- {
-
- /// <summary>
- /// 浠撳簱浠ｇ爜
- /// </summary>
- public string? StoreCode { get; set; }
-
- /// <summary>
- /// 浠撳簱鍚嶇О
- /// </summary>
- public string? StoreName { get; set; }
-
- /// <summary>
- /// 鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ��
- /// </summary>
- public string RedundantField1 { get; set; }
-
- /// <summary>
- /// 鍐椾綑瀛楁2 - 棰勭暀鎵╁睍鐢ㄩ��
- /// </summary>
- public string RedundantField2 { get; set; }
-
- /// <summary>
- /// 鍐椾綑瀛楁3 - 棰勭暀鎵╁睍鐢ㄩ��
- /// </summary>
- public string RedundantField3 { get; set; }
-
- /// <summary>
- /// 澶囨敞.
- /// </summary>
- public string? Remark { get; set; }
-
- /// <summary>
- /// 鎺掑簭
- /// </summary>
- public virtual int Sort { get; set; }
-
- /// <summary>
- /// 鏄惁绂佺敤
- /// </summary>
- public virtual bool? IsDisabled { get; set; }
-
- /// <summary>
- /// Adjusts the sort.
- /// </summary>
- /// <param name="sort">The sort.</param>
- public void AdjustSort(int sort)
- {
- Sort = sort;
- }
-
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/WmsStores/WmsStoreDataSeedContributor.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/WmsStores/WmsStoreDataSeedContributor.cs"
deleted file mode 100644
index 92b665d..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/WmsStores/WmsStoreDataSeedContributor.cs"
+++ /dev/null
@@ -1,67 +0,0 @@
-using Volo.Abp.Data;
-using Volo.Abp.DependencyInjection;
-using Volo.Abp.Guids;
-using Volo.Abp.Uow;
-
-namespace CMS.Plugin.HIAWms.Domain.WmsStores
-{
- /// <summary>
- /// WmsStore绉嶅瓙鏁版嵁鎻愪緵绋嬪簭
- /// </summary>
- public class WmsStoreDataSeedContributor : IDataSeedContributor, ITransientDependency
- {
- private readonly IUnitOfWorkManager _unitOfWorkManager;
- private readonly IWmsStoreRepository _wmsstoreRepository;
- private readonly IGuidGenerator _guidGenerator;
-
- /// <summary>
- /// Initializes a new instance of the <see cref="WmsStoreDataSeedContributor"/> class.
- /// </summary>
- /// <param name="unitOfWorkManager">The unit of work manager.</param>
- /// <param name="guidGenerator">The unique identifier generator.</param>
- /// <param name="wmsstoreRepository">The work section repository.</param>
- public WmsStoreDataSeedContributor(IUnitOfWorkManager unitOfWorkManager, IGuidGenerator guidGenerator, IWmsStoreRepository wmsstoreRepository)
- {
- _unitOfWorkManager = unitOfWorkManager;
- _wmsstoreRepository = wmsstoreRepository;
- _guidGenerator = guidGenerator;
- }
-
- /// <inheritdoc />
- public async Task SeedAsync(DataSeedContext context)
- {
- if (context.Properties.ContainsKey(CMSPluginDbProperties.ConnectionStringName) && context.Properties[CMSPluginDbProperties.ConnectionStringName]?.ToString() == CMSPluginDbProperties.ConnectionStringName)
- {
- try
- {
- //using var unitofWork = _unitOfWorkManager.Begin(requiresNew: true);
- //await unitofWork.SaveChangesAsync();
- }
- catch (Exception ex)
- {
- Console.WriteLine(ex.Message);
- }
- }
-
- if (context.Properties.ContainsKey("SeedTestData") && context.Properties["SeedTestData"]?.ToString() == "SeedTestData")
- {
- try
- {
- await SeedWmsStoreDataAsync();
- }
- catch (Exception e)
- {
- Console.WriteLine(e.Message);
- }
- }
- }
-
- /// <summary>
- /// Seeds the work section data asynchronous.
- /// </summary>
- private async Task SeedWmsStoreDataAsync()
- {
-
- }
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/WmsStores/WmsStoreSpecification.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/WmsStores/WmsStoreSpecification.cs"
deleted file mode 100644
index 4396267..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/WmsStores/WmsStoreSpecification.cs"
+++ /dev/null
@@ -1,41 +0,0 @@
-using System.Linq.Expressions;
-
-namespace CMS.Plugin.HIAWms.Domain.WmsStores
-{
- /// <summary>
- /// WmsStore瑙勭害
- /// </summary>
- public class WmsStoreSpecification : Volo.Abp.Specifications.Specification<WmsStore>
- {
- private readonly string _storeCode;
-
- /// <summary>
- /// Initializes a new instance of the <see cref="WmsStoreSpecification"/> class.
- /// </summary>
- public WmsStoreSpecification()
- {
- }
-
- /// <summary>
- /// Initializes a new instance of the <see cref="WmsStoreSpecification"/> class.
- /// </summary>
- /// <param name="storeCode">The name.</param>
- public WmsStoreSpecification(string storeCode = null)
- {
- _storeCode = storeCode;
- }
-
- /// <inheritdoc />
- public override Expression<Func<WmsStore, bool>> ToExpression()
- {
- Expression<Func<WmsStore, bool>> expression = c => 1 == 1;
-
- if (_storeCode != null)
- {
- expression = expression.And(c => c.StoreCode == _storeCode);
- }
-
- return expression;
- }
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/\346\226\260\346\226\207\344\273\266\345\244\271/WmsTask.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/\346\226\260\346\226\207\344\273\266\345\244\271/WmsTask.cs"
deleted file mode 100644
index 4330c5d..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/\346\226\260\346\226\207\344\273\266\345\244\271/WmsTask.cs"
+++ /dev/null
@@ -1,126 +0,0 @@
-锘縰sing CMS.Plugin.HIAWms.Domain.Shared.Enums;
-using NPOI.SS.Formula.Functions;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Volo.Abp.Domain.Entities.Auditing;
-
-namespace CMS.Plugin.HIAWms.Domain.WmsTask
-{
- /// <summary>
- /// 浠诲姟
- /// </summary>W
- public class WmsTask : FullAuditedAggregateRoot<Guid>
- {
- /// <summary>
- /// 浠诲姟鍙�
- /// </summary>
- public string TaskNo { get; set; }
-
- /// <summary>
- /// 浠诲姟绫诲瀷
- /// </summary>
- public TaskTypeEnum TaskType { get; set; }
-
- /// <summary>
- /// 浠诲姟绛夌骇
- /// </summary>
- public int TaskLevel { get; set; }
-
- /// <summary>
- /// 浠诲姟鐘舵��
- /// </summary>
- public WmsTaskStatus TaskStatus { get; set; }
-
- /// <summary>
- /// 鎵樼洏缂栧彿
- /// </summary>
- public string? ContainerNo { get; set; }
-
- /// <summary>
- /// 璧峰搴撲綅
- /// </summary>
- public string? SourcePlace { get; set; }
-
- /// <summary>
- /// 鐩爣搴撲綅
- /// </summary>
- public string? ToPlace { get; set; }
-
- /// <summary>
- /// 宸烽亾
- /// </summary>
- public int? Aisle { get; set; }
- /// <summary>
- /// 鍫嗗灈鏈篒D
- /// </summary>
- public int? DodeviceId { get; set; }
-
- /// <summary>
- /// 璁惧绫诲瀷
- /// </summary>
- public int Dodevicetype { get; set; }
-
-
- /// <summary>
- /// 璁惧浠诲姟鐘舵��
- /// </summary>
- public int TaskDodeviceStatus { get; set; }
-
- /// <summary>
- /// WCS鏄惁鍙互璇诲彇
- /// </summary>
- public bool IsRead { get; set; }
-
- /// <summary>
- /// 瀛愪换鍔＄被鍨�
- /// </summary>
- public SonTaskTypeEnum? SonTaskType { get; set; }
-
- /// <summary>
- /// 鏉ユ簮鍗曟嵁鍙�
- /// </summary>
- public string? SourceOrderNo { get; set; }
-
- /// <summary>
- /// 浠诲姟鍏宠仈鐨勪笅涓换鍔℃槸鍚︾敓鎴愭垚鍔燂紝澶辫触涓�1锛屽叾浠栨棤鎿嶄綔
- /// </summary>
- public int? IsNextTask { get; set; }
-
- /// <summary>
- /// 鍙彉鍙橀噺1
- /// </summary>
- public string? MutableParam1 { get; set; }
-
- /// <summary>
- /// 鍙彉鍙橀噺2
- /// </summary>
- public string? MutableParam2 { get; set; }
-
- /// <summary>
- /// 鍙彉鍙橀噺3
- /// </summary>
- public string? MutableParam3 { get; set; }
- /// <summary>
- /// 鎺掑簭
- /// </summary>
- public virtual int Sort { get; set; }
-
-
- /// <summary>
- /// 鏄惁绂佺敤
- /// </summary>
- public virtual bool? IsDisabled { get; set; }
-
- /// <summary>
- /// Adjusts the sort.
- /// </summary>
- /// <param name="sort">The sort.</param>
- public void AdjustSort(int sort)
- {
- Sort = sort;
- }
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.EntityFrameworkCore/CMS.Plugin.HIAWms.EntityFrameworkCore.csproj" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.EntityFrameworkCore/CMS.Plugin.HIAWms.EntityFrameworkCore.csproj"
deleted file mode 100644
index 4556780..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.EntityFrameworkCore/CMS.Plugin.HIAWms.EntityFrameworkCore.csproj"
+++ /dev/null
@@ -1,25 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
- <Import Project="../../common.props" />
- <Import Project="../../configureawait.props" />
-
- <PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
- </PropertyGroup>
-
- <ItemGroup>
- <PackageReference Include="Volo.Abp.Dapper" Version="$(ABPPackageVersion)" />
- <PackageReference Include="Volo.Abp.EntityFrameworkCore" Version="$(ABPPackageVersion)" />
- </ItemGroup>
-
- <ItemGroup>
- <ProjectReference Include="..\CMS.Plugin.HIAWms.Domain\CMS.Plugin.HIAWms.Domain.csproj" />
- </ItemGroup>
-
- <ItemGroup>
- <Reference Include="CmsQueryExtensions">
- <HintPath>..\..\..\..\..\CommonDLL\CmsQueryExtensions.dll</HintPath>
- </Reference>
- </ItemGroup>
-
-</Project>
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.EntityFrameworkCore/CMSPluginDapperRepository.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.EntityFrameworkCore/CMSPluginDapperRepository.cs"
deleted file mode 100644
index e928a04..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.EntityFrameworkCore/CMSPluginDapperRepository.cs"
+++ /dev/null
@@ -1,18 +0,0 @@
-using CMS.Plugin.HIAWms.Domain.Data;
-using Volo.Abp.Domain.Repositories.Dapper;
-using Volo.Abp.EntityFrameworkCore;
-
-namespace CMS.Plugin.HIAWms.EntityFrameworkCore;
-
-/// <inheritdoc />
-public class CMSPluginDapperRepository : DapperRepository<ICMSPluginDbContext>, ICMSPluginDapperRepository
-{
- /// <summary>
- /// Initializes a new instance of the <see cref="CMSPluginDapperRepository"/> class.
- /// </summary>
- /// <param name="dbContextProvider">The database context provider.</param>
- public CMSPluginDapperRepository(IDbContextProvider<ICMSPluginDbContext> dbContextProvider)
- : base(dbContextProvider)
- {
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.EntityFrameworkCore/CMSPluginDbSchemaMigrator.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.EntityFrameworkCore/CMSPluginDbSchemaMigrator.cs"
deleted file mode 100644
index 43c9d04..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.EntityFrameworkCore/CMSPluginDbSchemaMigrator.cs"
+++ /dev/null
@@ -1,37 +0,0 @@
-using CMS.Plugin.HIAWms.Domain.Data;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using Volo.Abp.DependencyInjection;
-
-namespace CMS.Plugin.HIAWms.EntityFrameworkCore;
-
-/// <inheritdoc />
-public class CMSPluginDbSchemaMigrator : ICMSPluginDbSchemaMigrator, ITransientDependency
-{
- private readonly IServiceProvider _serviceProvider;
- private readonly ILogger<CMSPluginDbSchemaMigrator> _logger;
-
- /// <summary>
- /// Initializes a new instance of the <see cref="CMSPluginDbSchemaMigrator"/> class.
- /// </summary>
- /// <param name="serviceProvider">The service provider.</param>
- public CMSPluginDbSchemaMigrator(IServiceProvider serviceProvider, ILogger<CMSPluginDbSchemaMigrator> logger)
- {
- _serviceProvider = serviceProvider;
- _logger = logger;
- }
-
- /// <inheritdoc />
- public async Task MigrateAsync()
- {
- /* We intentionally resolving the CMSDbContext
- * from IServiceProvider (instead of directly injecting it)
- * to properly get the connection string of the current tenant in the
- * current scope.
- */
- var database = _serviceProvider.GetRequiredService<ICMSPluginDbContext>().Database;
- _logger.LogInformation($"Start database {database.GetDbConnection().Database} migrate");
- await database.MigrateAsync();
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.EntityFrameworkCore/CMSPluginEfCoreEntityExtensionMappings.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.EntityFrameworkCore/CMSPluginEfCoreEntityExtensionMappings.cs"
deleted file mode 100644
index 785f426..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.EntityFrameworkCore/CMSPluginEfCoreEntityExtensionMappings.cs"
+++ /dev/null
@@ -1,47 +0,0 @@
-using CMS.Plugin.HIAWms.Domain.Shared;
-using Volo.Abp.Threading;
-
-namespace CMS.Plugin.HIAWms.EntityFrameworkCore;
-
-/// <summary>
-/// EfCore瀹炰綋鎵╁睍
-/// </summary>
-public static class CMSPluginEfCoreEntityExtensionMappings
-{
- private static readonly OneTimeRunner OneTimeRunner = new OneTimeRunner();
-
- /// <summary>
- /// Configures this instance.
- /// </summary>
- public static void Configure()
- {
- CMSPluginModuleExtensionConfigurator.Configure();
-
- OneTimeRunner.Run(() =>
- {
- /* You can configure extra properties for the
- * entities defined in the modules used by your application.
- *
- * This class can be used to map these extra properties to table fields in the database.
- *
- * USE THIS CLASS ONLY TO CONFIGURE EF CORE RELATED MAPPING.
- * USE CMSModuleExtensionConfigurator CLASS (in the Domain.Shared project)
- * FOR A HIGH LEVEL API TO DEFINE EXTRA PROPERTIES TO ENTITIES OF THE USED MODULES
- *
- * Example: Map a property to a table field:
-
- ObjectExtensionManager.Instance
- .MapEfCoreProperty<WmsContainer, string>(
- "MyProperty",
- (entityBuilder, propertyBuilder) =>
- {
- propertyBuilder.HasMaxLength(128);
- }
- );
-
- * See the documentation for more:
- * https://docs.abp.io/en/abp/latest/Customizing-Application-Modules-Extending-Entities
- */
- });
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.EntityFrameworkCore/CMSPluginEntityFrameworkCoreModule.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.EntityFrameworkCore/CMSPluginEntityFrameworkCoreModule.cs"
deleted file mode 100644
index 93017dd..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.EntityFrameworkCore/CMSPluginEntityFrameworkCoreModule.cs"
+++ /dev/null
@@ -1,26 +0,0 @@
-using CMS.Plugin.HIAWms.Domain;
-using Volo.Abp.EntityFrameworkCore;
-using Volo.Abp.Modularity;
-
-namespace CMS.Plugin.HIAWms.EntityFrameworkCore;
-
-/// <summary>
-/// EntityFrameworkCore妯″潡
-/// </summary>
-[DependsOn(
- typeof(CMSPluginDomainModule),
- typeof(AbpEntityFrameworkCoreModule)
- )]
-public class CMSPluginEntityFrameworkCoreModule : AbpModule
-{
- /// <inheritdoc />
- public override void PreConfigureServices(ServiceConfigurationContext context)
- {
- CMSPluginEfCoreEntityExtensionMappings.Configure();
- }
-
- /// <inheritdoc />
- public override void ConfigureServices(ServiceConfigurationContext context)
- {
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsArea.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsArea.cs"
deleted file mode 100644
index c335bd9..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsArea.cs"
+++ /dev/null
@@ -1,68 +0,0 @@
-using CMS.Plugin.HIAWms.Domain;
-using CMS.Plugin.HIAWms.Domain.WmsAreas;
-using CMS.Plugin.HIAWms.Domain.Shared.WmsAreas;
-using Microsoft.EntityFrameworkCore;
-using Volo.Abp;
-using Volo.Abp.EntityFrameworkCore.Modeling;
-
-namespace CMS.Plugin.HIAWms.EntityFrameworkCore.Extensions;
-
-/// <summary>
-/// EfCore鎵╁睍
-/// </summary>
-public static partial class CMSPluginEfCoreExtensions
-{
- /// <summary>
- /// Includes the details.
- /// </summary>
- /// <param name="queryable">The queryable.</param>
- /// <param name="include">if set to <c>true</c> [include].</param>
- /// <returns></returns>
- public static IQueryable<WmsArea> IncludeDetails(this IQueryable<WmsArea> queryable, bool include = true)
- {
- if (!include)
- {
- return queryable;
- }
-
- return queryable;
- }
-
- /// <summary>
- /// Configures the wmsarea.
- /// </summary>
- /// <param name="builder">The builder.</param>
- public static void ConfigureWmsArea(this ModelBuilder builder)
- {
- Check.NotNull(builder, nameof(builder));
-
- builder.Entity<WmsArea>(b =>
- {
- // Configure table & schema name
- b.ToTable((CMSPluginDbProperties.DbTablePrefix + "_WmsAreas").ToLower(), CMSPluginDbProperties.DbSchema).HasComment("搴撳尯琛�");
-
- b.ConfigureByConvention();
-
- // Properties
- b.Property(x => x.AreaNo).HasMaxLength(WmsAreaConsts.MaxNameLength).IsRequired().HasComment("搴撳尯缂栧彿");
- b.Property(x => x.AreaName).HasMaxLength(WmsAreaConsts.MaxAreaNameLength).IsRequired().HasComment("搴撳尯鍚嶇О");
- b.Property(x => x.AreaDesc).HasMaxLength(WmsAreaConsts.MaxAreaDescLength).IsRequired(false).HasComment("鎻忚堪");
- b.Property(x => x.AreaStatus).HasComment("搴撳尯鐘舵��");
- b.Property(x => x.AreaType).HasComment("搴撳尯绫诲瀷");
- b.Property(x => x.RedundantField1).HasMaxLength(WmsAreaConsts.MaxRedundantFieldLength).IsRequired(false).HasComment("鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ��");
- b.Property(x => x.RedundantField2).HasMaxLength(WmsAreaConsts.MaxRedundantFieldLength).IsRequired(false).HasComment("鍐椾綑瀛楁2 - 棰勭暀鎵╁睍鐢ㄩ��");
- b.Property(x => x.RedundantField3).HasMaxLength(WmsAreaConsts.MaxRedundantFieldLength).IsRequired(false).HasComment("鍐椾綑瀛楁3 - 棰勭暀鎵╁睍鐢ㄩ��");
- b.Property(x => x.StoreCode).HasMaxLength(WmsAreaConsts.MaxStoreCodeLength).IsRequired(false).HasComment("浠撳簱浠ｇ爜");
- b.Property(x => x.StoreName).HasMaxLength(WmsAreaConsts.MaxStoreNameLength).IsRequired(false).HasComment("浠撳簱鍚嶇О");
- b.Property(x => x.Sort).HasComment("鎺掑簭");
- b.Property(x => x.Remark).HasMaxLength(WmsAreaConsts.MaxRemarkLength).IsRequired(false).HasComment("澶囨敞");
- b.Property(x => x.IsDisabled).IsRequired(false).HasComment("鏄惁绂佺敤");
-
- // Indexes
- b.HasIndex(u => u.AreaName);
-
- // Apply object extension mappings
- b.ApplyObjectExtensionMappings();
- });
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsContainer.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsContainer.cs"
deleted file mode 100644
index 289cef0..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsContainer.cs"
+++ /dev/null
@@ -1,117 +0,0 @@
-using CMS.Plugin.HIAWms.Domain;
-using CMS.Plugin.HIAWms.Domain.WmsContainers;
-using CMS.Plugin.HIAWms.Domain.Shared.WmsContainers;
-using Microsoft.EntityFrameworkCore;
-using Volo.Abp;
-using Volo.Abp.EntityFrameworkCore.Modeling;
-
-namespace CMS.Plugin.HIAWms.EntityFrameworkCore.Extensions;
-
-/// <summary>
-/// EfCore鎵╁睍
-/// </summary>
-public static partial class CMSPluginEfCoreExtensions
-{
- /// <summary>
- /// Includes the details.
- /// </summary>
- /// <param name="queryable">The queryable.</param>
- /// <param name="include">if set to <c>true</c> [include].</param>
- /// <returns></returns>
- public static IQueryable<WmsContainer> IncludeDetails(this IQueryable<WmsContainer> queryable, bool include = true)
- {
- if (!include)
- {
- return queryable;
- }
-
- return queryable;
- }
-
- /// <summary>
- /// Configures the wmscontainer.
- /// </summary>
- /// <param name="builder">The builder.</param>
- public static void ConfigureWmsContainer(this ModelBuilder builder)
- {
- Check.NotNull(builder, nameof(builder));
-
- builder.Entity<WmsContainer>(b =>
- {
- b.ToTable((CMSPluginDbProperties.DbTablePrefix + "_WmsContainers").ToLower(), CMSPluginDbProperties.DbSchema)
- .HasComment("鎵樼洏淇℃伅琛�");
-
- b.ConfigureByConvention();
-
- //Properties
- b.Property(x => x.ContainerNo)
- .HasMaxLength(50)
- .IsRequired()
- .HasComment("鎵樼洏缂栧彿");
-
- b.Property(x => x.ContainerType)
- .IsRequired()
- .HasComment("鎵樼洏绫诲瀷");
-
- b.Property(x => x.ContainerStatus)
- .IsRequired()
- .HasComment("鎵樼洏鐘舵��");
-
- b.Property(x => x.SpecLength)
- .HasPrecision(18, 2)
- .HasComment("闀垮害");
-
- b.Property(x => x.SpecWidth)
- .HasPrecision(18, 2)
- .HasComment("瀹藉害");
-
- b.Property(x => x.SpecHeight)
- .HasPrecision(18, 2)
- .HasComment("楂樺害");
-
- b.Property(x => x.LimitLength)
- .HasPrecision(18, 2)
- .HasComment("闄愰暱");
-
- b.Property(x => x.LimitWidth)
- .HasPrecision(18, 2)
- .HasComment("闄愬");
-
- b.Property(x => x.LimitHeight)
- .HasPrecision(18, 2)
- .HasComment("闄愰珮");
-
- b.Property(x => x.MaxWeight)
- .HasPrecision(18, 2)
- .HasComment("杞介噸涓婇檺");
-
- b.Property(x => x.ExceptionNumber)
- .HasComment("寮傚父鏁伴噺");
-
- b.Property(x => x.MaterialNumber)
- .HasComment("鐗╂枡鏁伴噺");
-
- b.Property(x => x.RedundantField1)
- .HasMaxLength(200)
- .HasComment("鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ��");
-
- b.Property(x => x.RedundantField2)
- .HasMaxLength(200)
- .HasComment("鍐椾綑瀛楁2 - 棰勭暀鎵╁睍鐢ㄩ��");
-
- b.Property(x => x.RedundantField3)
- .HasMaxLength(200)
- .HasComment("鍐椾綑瀛楁3 - 棰勭暀鎵╁睍鐢ㄩ��");
-
- b.Property(x => x.Sort).HasComment("鎺掑簭");
- b.Property(x => x.IsDisabled).IsRequired(false).HasComment("鏄惁绂佺敤");
- b.Property(x => x.Remark).HasMaxLength(WmsContainerConsts.MaxRemarkLength).IsRequired(false).HasComment("澶囨敞");
-
- b.HasIndex(u => u.ContainerNo).IsUnique();
- b.HasIndex(u => u.ContainerType);
- b.HasIndex(u => u.ContainerStatus);
-
- b.ApplyObjectExtensionMappings();
- });
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsInOutStockRecord.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsInOutStockRecord.cs"
deleted file mode 100644
index ebcb94d..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsInOutStockRecord.cs"
+++ /dev/null
@@ -1,121 +0,0 @@
-锘縰sing CMS.Plugin.HIAWms.Domain;
-using CMS.Plugin.HIAWms.Domain.WmsInOutStockRecord;
-using Microsoft.EntityFrameworkCore;
-using Volo.Abp;
-using Volo.Abp.EntityFrameworkCore.Modeling;
-
-namespace CMS.Plugin.HIAWms.EntityFrameworkCore.Extensions
-{
- /// <summary>
- /// EfCore鎵╁睍
- /// </summary>
- public static partial class CMSPluginEfCoreExtensions
- {
- /// <summary>
- /// Includes the details.
- /// </summary>
- /// <param name="queryable">The queryable.</param>
- /// <param name="include">if set to <c>true</c> [include].</param>
- /// <returns></returns>
- public static IQueryable<WmsInOutStockRecord> IncludeDetails(this IQueryable<WmsInOutStockRecord> queryable, bool include = true)
- {
- if (!include)
- {
- return queryable;
- }
-
- return queryable;
- }
-
- /// <summary>
- /// Configures the wmsmaterial.
- /// </summary>
- /// <param name="builder"></param>
- public static void ConfigureWmsInOutStockRecord(this ModelBuilder builder)
- {
- Check.NotNull(builder, nameof(builder));
-
- builder.Entity<WmsInOutStockRecord>(b =>
- {
- b.ToTable((CMSPluginDbProperties.DbTablePrefix + "_WmsInOutStockRecords").ToLower(), CMSPluginDbProperties.DbSchema)
- .HasComment("鍑哄叆搴撹褰曡〃");
-
- b.ConfigureByConvention();
- // 涓婚敭閰嶇疆
- b.HasKey(x => x.Id);
- // Properties
- b.Property(x => x.OrderNo)
- .HasMaxLength(50)
- .IsRequired()
- .HasComment("鍗曟嵁缂栧彿");
-
- b.Property(x => x.MaterialName)
- .HasMaxLength(100)
- .IsRequired(false)
- .HasComment("鐗╂枡鍚嶇О");
-
- b.Property(x => x.MaterialNo)
- .HasMaxLength(50)
- .IsRequired()
- .HasComment("鐗╂枡浠跺彿");
-
- b.Property(x => x.StockType)
- .IsRequired()
- .HasComment("鎿嶄綔绫诲瀷");
-
- b.Property(x => x.ContainerNo)
- .HasMaxLength(50)
- .IsRequired(false)
- .HasComment("瀹瑰櫒缂栧彿");
-
- b.Property(x => x.MaterialModel)
- .HasMaxLength(50)
- .IsRequired(false)
- .HasComment("鏈哄瀷");
-
- b.Property(x => x.OperateTime)
- .IsRequired(false)
- .HasComment("鎿嶄綔鏃堕棿");
-
- b.Property(x => x.Remark)
- .HasMaxLength(500)
- .IsRequired(false)
- .HasComment("澶囨敞");
-
- b.Property(x => x.MaterialId)
- .HasMaxLength(50)
- .IsRequired()
- .HasComment("鐗╂枡ID");
-
- b.Property(x => x.TaskNo)
- .HasMaxLength(50)
- .IsRequired()
- .HasComment("浠诲姟鍙�");
-
- b.Property(x => x.SourcePlace)
- .HasMaxLength(50)
- .IsRequired(false)
- .HasComment("璧峰搴撲綅");
-
- b.Property(x => x.ToPlace)
- .HasMaxLength(50)
- .IsRequired(false)
- .HasComment("鐩爣搴撲綅");
-
- b.Property(x => x.Sort).HasComment("鎺掑簭");
- b.Property(x => x.IsDisabled).IsRequired(false).HasComment("鏄惁绂佺敤");
-
- // Indexes
- b.HasIndex(x => x.OrderNo);
- b.HasIndex(x => x.MaterialNo);
- b.HasIndex(x => x.MaterialId);
- b.HasIndex(x => x.TaskNo);
- b.HasIndex(x => x.StockType);
- b.HasIndex(x => x.ContainerNo);
- b.HasIndex(x => x.OperateTime);
-
- b.ApplyObjectExtensionMappings();
- });
- }
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsMaterial.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsMaterial.cs"
deleted file mode 100644
index 67ae4b3..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsMaterial.cs"
+++ /dev/null
@@ -1,144 +0,0 @@
-using CMS.Plugin.HIAWms.Domain;
-using CMS.Plugin.HIAWms.Domain.Shared.Enums;
-using CMS.Plugin.HIAWms.Domain.WmsMaterial;
-using Microsoft.EntityFrameworkCore;
-using Volo.Abp;
-using Volo.Abp.EntityFrameworkCore.Modeling;
-
-namespace CMS.Plugin.HIAWms.EntityFrameworkCore.Extensions;
-
-/// <summary>
-/// EfCore鎵╁睍
-/// </summary>
-public static partial class CMSPluginEfCoreExtensions
-{
- /// <summary>
- /// Includes the details.
- /// </summary>
- /// <param name="queryable">The queryable.</param>
- /// <param name="include">if set to <c>true</c> [include].</param>
- /// <returns></returns>
- public static IQueryable<WmsMaterial> IncludeDetails(this IQueryable<WmsMaterial> queryable, bool include = true)
- {
- if (!include)
- {
- return queryable;
- }
-
- return queryable;
- }
-
- /// <summary>
- /// Configures the wmsmaterial.
- /// </summary>
- /// <param name="builder">The builder.</param>
- public static void ConfigureWmsMaterial(this ModelBuilder builder)
- {
- Check.NotNull(builder, nameof(builder));
-
- builder.Entity<WmsMaterial>(b =>
- {
- // 閰嶇疆琛ㄥ悕鍜屾敞閲�
- b.ToTable((CMSPluginDbProperties.DbTablePrefix + "_WmsMaterials").ToLower(),
- CMSPluginDbProperties.DbSchema)
- .HasComment("鐗╂枡鍩虹淇℃伅琛�");
-
- b.ConfigureByConvention();
-
- // 涓婚敭閰嶇疆锛團ullAuditedAggregateRoot<Guid> 宸查粯璁ゅ寘鍚� Id锛�
- b.HasKey(x => x.Id);
-
- // 瀛楁閰嶇疆
- b.Property(x => x.MaterialCode)
- .HasMaxLength(64)
- .IsRequired()
- .HasComment("鐗╂枡缂栫爜锛堝敮涓�鏍囪瘑锛�");
-
- b.Property(x => x.MaterialName)
- .HasMaxLength(128)
- .IsRequired()
- .HasComment("鐗╂枡鍚嶇О");
-
- b.Property(x => x.PurchaseType)
- .HasComment("閲囪喘绫诲瀷锛堟灇涓惧�硷級");
-
- b.Property(x => x.MaterialType)
- .HasComment("鐗╂枡绫诲瀷锛堟灇涓惧�硷級");
-
- b.Property(x => x.PrimaryUnit)
- .HasMaxLength(20)
- .HasComment("涓诲崟浣嶏紙濡傦細kg銆乵銆佷釜锛�");
-
- b.Property(x => x.Standard)
- .HasMaxLength(128)
- .HasComment("瑙勬牸/鏍囧噯锛堝锛欸B/T 8163-2018锛�");
-
- b.Property(x => x.OuterDiameter)
- .HasColumnType("decimal(18,2)")
- .HasComment("澶栧緞锛堝崟浣嶏細mm锛�");
-
- b.Property(x => x.WallThickness)
- .HasColumnType("decimal(18,2)")
- .HasComment("澹佸帤锛堝崟浣嶏細mm锛�");
-
- b.Property(x => x.MaterialQuality)
- .HasMaxLength(64)
- .HasComment("鏉愯川锛堝锛�304涓嶉攬閽級");
-
- b.Property(x => x.Length)
- .HasColumnType("decimal(18,2)")
- .HasComment("闀垮害锛堝崟浣嶏細m锛�");
-
- b.Property(x => x.IsMainBranch)
- .HasDefaultValue(YesNoEnum.N)
- .HasComment("鏄惁涓轰富鏀");
-
- b.Property(x => x.Factory)
- .HasMaxLength(64)
- .HasComment("鐢熶骇宸ュ巶");
-
- b.Property(x => x.Certification)
- .HasMaxLength(128)
- .HasComment("璇佷功缂栧彿");
-
- // 鍐椾綑瀛楁閰嶇疆
- b.Property(x => x.RedundantField1)
- .HasMaxLength(256)
- .IsRequired(false)
- .HasComment("鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ��");
-
- b.Property(x => x.RedundantField2)
- .HasMaxLength(256)
- .IsRequired(false)
- .HasComment("鍐椾綑瀛楁2 - 棰勭暀鎵╁睍鐢ㄩ��");
-
- b.Property(x => x.RedundantField3)
- .HasMaxLength(256)
- .IsRequired(false)
- .HasComment("鍐椾綑瀛楁3 - 棰勭暀鎵╁睍鐢ㄩ��");
-
- // 鍏朵粬閫氱敤瀛楁
- b.Property(x => x.Sort)
- .HasDefaultValue(0)
- .HasComment("鎺掑簭");
-
- b.Property(x => x.Remark)
- .HasMaxLength(500)
- .IsRequired(false)
- .HasComment("澶囨敞");
-
- b.Property(x => x.IsDisabled)
- .IsRequired(false)
- .HasDefaultValue(false)
- .HasComment("鏄惁绂佺敤");
-
- // 绱㈠紩閰嶇疆
- b.HasIndex(x => x.MaterialCode).IsUnique(); // 鐗╂枡缂栫爜鍞竴绱㈠紩
- b.HasIndex(x => x.MaterialName); // 鐗╂枡鍚嶇О鏅�氱储寮�
- b.HasIndex(x => x.PurchaseType); // 閲囪喘绫诲瀷绱㈠紩锛堝闇�鏌ヨ杩囨护锛�
- b.HasIndex(x => x.MaterialType); // 鐗╂枡绫诲瀷绱㈠紩锛堝闇�鏌ヨ杩囨护锛�
-
- b.ApplyObjectExtensionMappings();
- });
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsPlace.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsPlace.cs"
deleted file mode 100644
index b557a95..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsPlace.cs"
+++ /dev/null
@@ -1,74 +0,0 @@
-using CMS.Plugin.HIAWms.Domain;
-using CMS.Plugin.HIAWms.Domain.WmsPlaces;
-using CMS.Plugin.HIAWms.Domain.Shared.WmsPlaces;
-using Microsoft.EntityFrameworkCore;
-using Volo.Abp;
-using Volo.Abp.EntityFrameworkCore.Modeling;
-
-namespace CMS.Plugin.HIAWms.EntityFrameworkCore.Extensions;
-
-/// <summary>
-/// EfCore鎵╁睍
-/// </summary>
-public static partial class CMSPluginEfCoreExtensions
-{
- /// <summary>
- /// Includes the details.
- /// </summary>
- /// <param name="queryable">The queryable.</param>
- /// <param name="include">if set to <c>true</c> [include].</param>
- /// <returns></returns>
- public static IQueryable<WmsPlace> IncludeDetails(this IQueryable<WmsPlace> queryable, bool include = true)
- {
- if (!include)
- {
- return queryable;
- }
-
- return queryable;
- }
-
- /// <summary>
- /// Configures the wmsplace.
- /// </summary>
- /// <param name="builder">The builder.</param>
- public static void ConfigureWmsPlace(this ModelBuilder builder)
- {
- Check.NotNull(builder, nameof(builder));
-
- builder.Entity<WmsPlace>(b =>
- {
- // Configure table & schema name
- b.ToTable((CMSPluginDbProperties.DbTablePrefix + "_WmsPlaces").ToLower(), CMSPluginDbProperties.DbSchema).HasComment("搴撲綅琛�");
-
- b.ConfigureByConvention();
-
- // Properties
- b.Property(x => x.PlaceNo).HasMaxLength(WmsPlaceConsts.MaxPlaceNoLength).IsRequired().HasComment("缂栧彿");
- b.Property(x => x.StorageTypeNo).HasComment("璐т綅绫诲瀷");
- b.Property(x => x.PlaceStatus).HasComment("璐т綅鐘舵��");
- b.Property(x => x.AreaCode).HasMaxLength(WmsPlaceConsts.MaxAreaCodeLength).IsRequired().HasComment("鎵�鍦ㄥ簱鍖�");
- b.Property(x => x.Aisle).HasComment("宸烽亾");
- b.Property(x => x.RowNo).HasComment("鎺�");
- b.Property(x => x.ColumnNo).HasComment("鍒�");
- b.Property(x => x.LayerNo).HasComment("灞�");
- b.Property(x => x.Islock).HasComment("鏄惁閿佸畾");
- b.Property(x => x.EmptyContainer).HasComment("鏄惁绌烘墭");
- b.Property(x => x.RedundantField1).HasMaxLength(WmsPlaceConsts.MaxRedundantFieldLength).IsRequired(false).HasComment("鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ��");
- b.Property(x => x.RedundantField2).HasMaxLength(WmsPlaceConsts.MaxRedundantFieldLength).IsRequired(false).HasComment("鍐椾綑瀛楁2 - 棰勭暀鎵╁睍鐢ㄩ��");
- b.Property(x => x.RedundantField3).HasMaxLength(WmsPlaceConsts.MaxRedundantFieldLength).IsRequired(false).HasComment("鍐椾綑瀛楁3 - 棰勭暀鎵╁睍鐢ㄩ��");
- b.Property(x => x.Sort).HasComment("鎺掑簭");
- b.Property(x => x.Remark).HasMaxLength(WmsPlaceConsts.MaxRemarkLength).IsRequired(false).HasComment("澶囨敞");
- b.Property(x => x.IsDisabled).IsRequired(false).HasComment("鏄惁绂佺敤");
-
- // Indexes
- b.HasIndex(u => u.PlaceNo).IsUnique(); // 缂栧彿瀛楁娣诲姞鍞竴绱㈠紩
- b.HasIndex(u => u.AreaCode); // 鎵�鍦ㄥ簱鍖哄瓧娈垫坊鍔犳櫘閫氱储寮�
- b.HasIndex(u => u.StorageTypeNo); // 璐т綅绫诲瀷瀛楁娣诲姞鏅�氱储寮�
- b.HasIndex(u => u.PlaceStatus); // 璐т綅绫诲瀷瀛楁娣诲姞鏅�氱储寮�
-
- // Apply object extension mappings
- b.ApplyObjectExtensionMappings();
- });
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsStore.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsStore.cs"
deleted file mode 100644
index 59ed277..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsStore.cs"
+++ /dev/null
@@ -1,63 +0,0 @@
-using CMS.Plugin.HIAWms.Domain;
-using CMS.Plugin.HIAWms.Domain.WmsStores;
-using CMS.Plugin.HIAWms.Domain.Shared.WmsStores;
-using Microsoft.EntityFrameworkCore;
-using Volo.Abp;
-using Volo.Abp.EntityFrameworkCore.Modeling;
-
-namespace CMS.Plugin.HIAWms.EntityFrameworkCore.Extensions;
-
-/// <summary>
-/// EfCore鎵╁睍
-/// </summary>
-public static partial class CMSPluginEfCoreExtensions
-{
- /// <summary>
- /// Includes the details.
- /// </summary>
- /// <param name="queryable">The queryable.</param>
- /// <param name="include">if set to <c>true</c> [include].</param>
- /// <returns></returns>
- public static IQueryable<WmsStore> IncludeDetails(this IQueryable<WmsStore> queryable, bool include = true)
- {
- if (!include)
- {
- return queryable;
- }
-
- return queryable;
- }
-
- /// <summary>
- /// Configures the wmsstore.
- /// </summary>
- /// <param name="builder">The builder.</param>
- public static void ConfigureWmsStore(this ModelBuilder builder)
- {
- Check.NotNull(builder, nameof(builder));
-
- builder.Entity<WmsStore>(b =>
- {
- // Configure table & schema name
- b.ToTable((CMSPluginDbProperties.DbTablePrefix + "_WmsStores").ToLower(), CMSPluginDbProperties.DbSchema).HasComment("浠撳簱淇℃伅琛�");
-
- b.ConfigureByConvention();
-
- // Properties
- b.Property(x => x.StoreCode).HasMaxLength(WmsStoreConsts.MaxStoreCodeLength).IsRequired(false).HasComment("浠撳簱浠ｇ爜");
- b.Property(x => x.StoreName).HasMaxLength(WmsStoreConsts.MaxStoreNameLength).IsRequired(false).HasComment("浠撳簱鍚嶇О");
- b.Property(x => x.RedundantField1).HasMaxLength(WmsStoreConsts.MaxRedundantFieldLength).IsRequired(false).HasComment("鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ��");
- b.Property(x => x.RedundantField2).HasMaxLength(WmsStoreConsts.MaxRedundantFieldLength).IsRequired(false).HasComment("鍐椾綑瀛楁2 - 棰勭暀鎵╁睍鐢ㄩ��");
- b.Property(x => x.RedundantField3).HasMaxLength(WmsStoreConsts.MaxRedundantFieldLength).IsRequired(false).HasComment("鍐椾綑瀛楁3 - 棰勭暀鎵╁睍鐢ㄩ��");
- b.Property(x => x.Remark).HasMaxLength(WmsStoreConsts.MaxRemarkLength).IsRequired(false).HasComment("澶囨敞");
- b.Property(x => x.Sort).HasComment("鎺掑簭");
- b.Property(x => x.IsDisabled).IsRequired(false).HasComment("鏄惁绂佺敤");
-
- // Indexes
- b.HasIndex(u => u.StoreName);
-
- // Apply object extension mappings
- b.ApplyObjectExtensionMappings();
- });
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsTask.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsTask.cs"
deleted file mode 100644
index b72a67b..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsTask.cs"
+++ /dev/null
@@ -1,153 +0,0 @@
-锘縰sing CMS.Plugin.HIAWms.Domain;
-using CMS.Plugin.HIAWms.Domain.WmsTask;
-using Microsoft.EntityFrameworkCore;
-using Volo.Abp;
-using Volo.Abp.EntityFrameworkCore.Modeling;
-
-namespace CMS.Plugin.HIAWms.EntityFrameworkCore.Extensions
-{
- /// <summary>
- /// EfCore鎵╁睍
- /// </summary>
- public static partial class CMSPluginEfCoreExtensions
- {
- /// <summary>
- /// Includes the details.
- /// </summary>
- /// <param name="queryable">The queryable.</param>
- /// <param name="include">if set to <c>true</c> [include].</param>
- /// <returns></returns>
- public static IQueryable<WmsTask> IncludeDetails(this IQueryable<WmsTask> queryable, bool include = true)
- {
- if (!include)
- {
- return queryable;
- }
-
- return queryable;
- }
- /// <summary>
- /// Configures the WMS task entity.
- /// </summary>
- /// <param name="builder">The builder.</param>
- public static void ConfigureWmsTask(this ModelBuilder builder)
- {
- Check.NotNull(builder, nameof(builder));
-
- builder.Entity<WmsTask>(b =>
- {
- b.ToTable((CMSPluginDbProperties.DbTablePrefix + "_WmsTasks").ToLower(), CMSPluginDbProperties.DbSchema)
- .HasComment("浠诲姟琛�");
-
- b.ConfigureByConvention();
-
- // Primary key configuration (inherited from FullAuditedAggregateRoot<Guid>)
- b.HasKey(x => x.Id);
-
- // Properties configuration
- b.Property(x => x.TaskNo)
- .HasMaxLength(50)
- .IsRequired()
- .HasComment("浠诲姟鍙�");
-
- b.Property(x => x.TaskType)
- .IsRequired()
- .HasComment("浠诲姟绫诲瀷");
-
- b.Property(x => x.TaskLevel)
- .IsRequired()
- .HasComment("浠诲姟绛夌骇");
-
- b.Property(x => x.TaskStatus)
- .IsRequired()
- .HasComment("浠诲姟鐘舵��");
-
- b.Property(x => x.ContainerNo)
- .HasMaxLength(50)
- .IsRequired(false)
- .HasComment("鎵樼洏缂栧彿");
-
- b.Property(x => x.SourcePlace)
- .HasMaxLength(50)
- .IsRequired(false)
- .HasComment("璧峰搴撲綅");
-
- b.Property(x => x.ToPlace)
- .HasMaxLength(50)
- .IsRequired(false)
- .HasComment("鐩爣搴撲綅");
-
- b.Property(x => x.Aisle)
- .IsRequired(false)
- .HasComment("宸烽亾");
-
- b.Property(x => x.DodeviceId)
- .IsRequired(false)
- .HasComment("鍫嗗灈鏈篒D");
-
- b.Property(x => x.Dodevicetype)
- .IsRequired()
- .HasComment("璁惧绫诲瀷");
-
- b.Property(x => x.TaskDodeviceStatus)
- .IsRequired()
- .HasComment("璁惧浠诲姟鐘舵��");
-
- b.Property(x => x.IsRead)
- .IsRequired()
- .HasComment("WCS鏄惁鍙互璇诲彇");
-
- b.Property(x => x.SonTaskType)
- .IsRequired(false)
- .HasComment("瀛愪换鍔＄被鍨�");
-
- b.Property(x => x.SourceOrderNo)
- .HasMaxLength(50)
- .IsRequired(false)
- .HasComment("鏉ユ簮鍗曟嵁鍙�");
-
- b.Property(x => x.IsNextTask)
- .IsRequired(false)
- .HasComment("涓嬩釜浠诲姟鏄惁鐢熸垚鎴愬姛");
-
- b.Property(x => x.MutableParam1)
- .HasMaxLength(200)
- .IsRequired(false)
- .HasComment("鍙彉鍙橀噺1");
-
- b.Property(x => x.MutableParam2)
- .HasMaxLength(200)
- .IsRequired(false)
- .HasComment("鍙彉鍙橀噺2");
-
- b.Property(x => x.MutableParam3)
- .HasMaxLength(200)
- .IsRequired(false)
- .HasComment("鍙彉鍙橀噺3");
-
- b.Property(x => x.Sort)
- .IsRequired()
- .HasComment("鎺掑簭");
-
- b.Property(x => x.IsDisabled)
- .IsRequired(false)
- .HasComment("鏄惁绂佺敤");
-
- // Indexes configuration
- b.HasIndex(x => x.TaskNo).IsUnique();
- b.HasIndex(x => x.TaskType);
- b.HasIndex(x => x.TaskStatus);
- b.HasIndex(x => x.ContainerNo);
- b.HasIndex(x => x.SourcePlace);
- b.HasIndex(x => x.ToPlace);
- b.HasIndex(x => x.DodeviceId);
- b.HasIndex(x => x.IsRead);
- b.HasIndex(x => x.SourceOrderNo);
- b.HasIndex(x => x.Sort);
-
- b.ApplyObjectExtensionMappings();
- });
- }
- }
-
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.EntityFrameworkCore/ICMSPluginDbContext.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.EntityFrameworkCore/ICMSPluginDbContext.cs"
deleted file mode 100644
index 89c690f..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.EntityFrameworkCore/ICMSPluginDbContext.cs"
+++ /dev/null
@@ -1,14 +0,0 @@
-using CMS.Plugin.HIAWms.Domain;
-using Volo.Abp.Data;
-using Volo.Abp.EntityFrameworkCore;
-
-namespace CMS.Plugin.HIAWms.EntityFrameworkCore
-{
- /// <summary>
- /// 鏁版嵁搴撲笂涓嬫枃
- /// </summary>
- [ConnectionStringName(CMSPluginDbProperties.ConnectionStringName)]
- public interface ICMSPluginDbContext : IEfCoreDbContext
- {
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsAreaRepository.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsAreaRepository.cs"
deleted file mode 100644
index 64d4d26..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsAreaRepository.cs"
+++ /dev/null
@@ -1,115 +0,0 @@
-using System;
-using System.Linq.Dynamic.Core;
-using CMS.Plugin.HIAWms.Domain.WmsAreas;
-using CMS.Plugin.HIAWms.EntityFrameworkCore.Extensions;
-using DatabaseSchemaReader.Filters;
-using MathNet.Numerics;
-using Microsoft.EntityFrameworkCore;
-using Volo.Abp.Domain.Repositories.EntityFrameworkCore;
-using Volo.Abp.EntityFrameworkCore;
-using Volo.Abp.Specifications;
-
-namespace CMS.Plugin.HIAWms.EntityFrameworkCore.Repositories;
-
-/// <inheritdoc />
-public class EfCoreWmsAreaRepository : EfCoreRepository<ICMSPluginDbContext, WmsArea, Guid>, IWmsAreaRepository
-{
- /// <summary>
- /// Initializes a new instance of the <see cref="EfCoreWmsAreaRepository"/> class.
- /// </summary>
- /// <param name="dbContextProvider">The database context provider.</param>
- public EfCoreWmsAreaRepository(IDbContextProvider<ICMSPluginDbContext> dbContextProvider)
- : base(dbContextProvider)
- {
- }
-
- /// <inheritdoc />
- public virtual async Task<WmsArea> FindByNameAsync(string name, CancellationToken cancellationToken = default)
- {
- return await (await GetDbSetAsync())
- .IncludeDetails()
- .OrderBy(t => t.Sort)
- .Where(x => !x.IsDeleted)
- .FirstOrDefaultAsync(t => t.AreaName == name, GetCancellationToken(cancellationToken));
- }
-
-
- /// <summary>
- /// 查看库区是否存在
- /// </summary>
- /// <param name="areaNo"></param>
- /// <param name="id"></param>
- /// <returns></returns>
- public async Task<bool> NameExistAsync(string areaNo, Guid? id = null)
- {
- return await (await GetDbSetAsync()).WhereIf(id.HasValue, p => p.Id != id)
- .Where(x => !x.IsDeleted).AnyAsync(x => x.AreaNo == areaNo);
- }
-
- /// <inheritdoc />
- public async Task<int> GetMaxSortAsync()
- {
- var hasAny = await (await GetQueryableAsync())
- .Where(x => !x.IsDeleted).AnyAsync();
- if (!hasAny)
- {
- return 1;
- }
-
- var sort = await (await GetQueryableAsync())
- .Where(x => !x.IsDeleted).MaxAsync(x => x.Sort);
- return sort + 1;
- }
-
- /// <inheritdoc />
- public async Task<List<WmsArea>> GetListAsync(WmsArea? area, string sorting = null, int maxResultCount = int.MaxValue, int skipCount = 0, string filter = null, Specification<WmsArea> specification = null, bool includeDetails = false, CancellationToken cancellationToken = default)
- {
- specification ??= new WmsAreaSpecification();
- return await (await GetDbSetAsync())
- .IncludeDetails(includeDetails)
- .Where(specification.ToExpression())
- .WhereIf(!filter.IsNullOrWhiteSpace(), u => u.AreaNo.Contains(filter))
- .WhereIf(!string.IsNullOrEmpty(area.AreaNo), u => u.AreaNo.Contains(area.AreaNo))
- .WhereIf(!string.IsNullOrEmpty(area.AreaName), u => u.AreaNo.Contains(area.AreaName))
- .WhereIf(!string.IsNullOrEmpty(area.StoreCode), u => u.AreaNo == area.StoreCode)
- .WhereIf(area.AreaStatus > 0, u => u.AreaStatus == area.AreaStatus)
- .WhereIf(area.AreaType > 0, u => u.AreaType == area.AreaType)
- .Where(x => !x.IsDeleted)
- .OrderBy(sorting.IsNullOrEmpty() ? nameof(WmsArea.Sort) : sorting)
- .PageBy(skipCount, maxResultCount)
- .ToListAsync(GetCancellationToken(cancellationToken));
- }
-
- /// <summary>
- /// 获取库区列表
- /// </summary>
- /// <param name="cancellationToken"></param>
- /// <returns></returns>
- public async Task<List<WmsArea>> GetListForSelectAsync(CancellationToken cancellationToken = default)
- {
- return await (await GetDbSetAsync())
- .ToListAsync(GetCancellationToken(cancellationToken));
- }
-
- /// <inheritdoc />
- public async Task<long> GetCountAsync(WmsArea? area, string filter = null, Specification<WmsArea> specification = null, CancellationToken cancellationToken = default)
- {
- specification ??= new WmsAreaSpecification();
- return await (await GetQueryableAsync())
- .Where(specification.ToExpression())
- .WhereIf(!filter.IsNullOrWhiteSpace(), u => u.AreaNo.Contains(filter))
- .WhereIf(!string.IsNullOrEmpty(area.AreaNo), u => u.AreaNo.Contains(area.AreaNo))
- .WhereIf(!string.IsNullOrEmpty(area.AreaName), u => u.AreaNo.Contains(area.AreaName))
- .WhereIf(!string.IsNullOrEmpty(area.StoreCode), u => u.AreaNo == area.StoreCode)
- .WhereIf(area.AreaStatus > 0, u => u.AreaStatus == area.AreaStatus)
- .WhereIf(area.AreaType > 0, u => u.AreaType == area.AreaType)
- .Where(x => !x.IsDeleted)
- .CountAsync(cancellationToken: GetCancellationToken(cancellationToken));
- }
-
- /// <inheritdoc />
- public override async Task<IQueryable<WmsArea>> WithDetailsAsync()
- {
- return (await GetQueryableAsync()).Where(x => !x.IsDeleted).IncludeDetails();
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsContainerRepository.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsContainerRepository.cs"
deleted file mode 100644
index f42bc56..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsContainerRepository.cs"
+++ /dev/null
@@ -1,107 +0,0 @@
-using System.Linq.Dynamic.Core;
-using CMS.Plugin.HIAWms.Domain.WmsContainers;
-using CMS.Plugin.HIAWms.EntityFrameworkCore.Extensions;
-using Microsoft.EntityFrameworkCore;
-using Volo.Abp.Domain.Repositories.EntityFrameworkCore;
-using Volo.Abp.EntityFrameworkCore;
-using Volo.Abp.Specifications;
-
-namespace CMS.Plugin.HIAWms.EntityFrameworkCore.Repositories;
-
-/// <inheritdoc />
-public class EfCoreWmsContainerRepository : EfCoreRepository<ICMSPluginDbContext, WmsContainer, Guid>, IWmsContainerRepository
-{
- /// <summary>
- /// Initializes a new instance of the <see cref="EfCoreWmsContainerRepository"/> class.
- /// </summary>
- /// <param name="dbContextProvider">The database context provider.</param>
- public EfCoreWmsContainerRepository(IDbContextProvider<ICMSPluginDbContext> dbContextProvider)
- : base(dbContextProvider)
- {
- }
-
- /// <inheritdoc />
- public virtual async Task<WmsContainer> FindByNameAsync(string containerNo, CancellationToken cancellationToken = default)
- {
- return await (await GetDbSetAsync())
- .IncludeDetails()
- .Where(x => !x.IsDeleted)
- .OrderBy(t => t.Sort)
- .FirstOrDefaultAsync(t => t.ContainerNo == containerNo, GetCancellationToken(cancellationToken));
- }
-
- /// <inheritdoc />
- public async Task<bool> NameExistAsync(string containerNo, Guid? id = null)
- {
- return await (await GetDbSetAsync()).WhereIf(id.HasValue, p => p.Id != id).Where(x => !x.IsDeleted).AnyAsync(x => x.ContainerNo == containerNo);
- }
-
- /// <inheritdoc />
- public async Task<int> GetMaxSortAsync()
- {
- var hasAny = await (await GetQueryableAsync()).Where(x => !x.IsDeleted).AnyAsync();
- if (!hasAny)
- {
- return 1;
- }
-
- var sort = await (await GetQueryableAsync())
- .Where(x => !x.IsDeleted).MaxAsync(x => x.Sort);
- return sort + 1;
- }
-
- /// <summary>
- /// 查询列表
- /// </summary>
- /// <param name="container"></param>
- /// <param name="sorting"></param>
- /// <param name="maxResultCount"></param>
- /// <param name="skipCount"></param>
- /// <param name="filter"></param>
- /// <param name="specification"></param>
- /// <param name="includeDetails"></param>
- /// <param name="cancellationToken"></param>
- /// <returns></returns>
- public async Task<List<WmsContainer>> GetListAsync(WmsContainer? container,string sorting = null, int maxResultCount = int.MaxValue, int skipCount = 0, string filter = null, Specification<WmsContainer> specification = null, bool includeDetails = false, CancellationToken cancellationToken = default)
- {
- specification ??= new WmsContainerSpecification();
- return await (await GetDbSetAsync())
- .IncludeDetails(includeDetails)
- .Where(specification.ToExpression())
- .Where(x => !x.IsDeleted)
- .WhereIf(!filter.IsNullOrWhiteSpace(), u => u.ContainerNo.Contains(filter))
- .WhereIf(!string.IsNullOrEmpty(container.ContainerNo),u=>u.ContainerNo.Contains(container.ContainerNo))
- .WhereIf(container.ContainerStatus>0, u=>u.ContainerStatus == u.ContainerStatus)
- .WhereIf(container.ContainerType>0, u=>u.ContainerType == u.ContainerType)
- .OrderBy(sorting.IsNullOrEmpty() ? nameof(WmsContainer.Sort) : sorting)
- .PageBy(skipCount, maxResultCount)
- .ToListAsync(GetCancellationToken(cancellationToken));
- }
-
- /// <summary>
- /// 查询数量
- /// </summary>
- /// <param name="container"></param>
- /// <param name="filter"></param>
- /// <param name="specification"></param>
- /// <param name="cancellationToken"></param>
- /// <returns></returns>
- public async Task<long> GetCountAsync(WmsContainer? container, string filter = null, Specification<WmsContainer> specification = null, CancellationToken cancellationToken = default)
- {
- specification ??= new WmsContainerSpecification();
- return await (await GetQueryableAsync())
- .Where(specification.ToExpression())
- .Where(x => !x.IsDeleted)
- .WhereIf(!string.IsNullOrEmpty(container.ContainerNo), u => u.ContainerNo.Contains(container.ContainerNo))
- .WhereIf(container.ContainerStatus > 0, u => u.ContainerStatus == u.ContainerStatus)
- .WhereIf(container.ContainerType > 0, u => u.ContainerType == u.ContainerType)
- .WhereIf(!filter.IsNullOrWhiteSpace(), u => u.ContainerNo.Contains(filter))
- .CountAsync(cancellationToken: GetCancellationToken(cancellationToken));
- }
-
- /// <inheritdoc />
- public override async Task<IQueryable<WmsContainer>> WithDetailsAsync()
- {
- return (await GetQueryableAsync()).Where(x => !x.IsDeleted).IncludeDetails();
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsInOutStockRecordRepository.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsInOutStockRecordRepository.cs"
deleted file mode 100644
index fb76acf..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsInOutStockRecordRepository.cs"
+++ /dev/null
@@ -1,113 +0,0 @@
-using CMS.Plugin.HIAWms.Domain.WmsInOutStockRecord;
-using CMS.Plugin.HIAWms.EntityFrameworkCore.Extensions;
-using CmsQueryExtensions.Extension;
-using Microsoft.EntityFrameworkCore;
-using System.Linq.Dynamic.Core;
-using System.Linq.Expressions;
-using Volo.Abp.Domain.Repositories.EntityFrameworkCore;
-using Volo.Abp.EntityFrameworkCore;
-
-
-namespace CMS.Plugin.HIAWms.EntityFrameworkCore.Repositories;
-
-/// <summary>
-/// 鍑哄叆搴撹褰曡〃浠撳偍瀹炵幇
-/// </summary>
-public class EfCoreWmsInOutStockRecordRepository : EfCoreRepository<ICMSPluginDbContext, WmsInOutStockRecord, Guid>, IWmsInOutStockRecordRepository
-{
- /// <summary>
- /// Initializes a new instance of the <see cref="EfCoreWmsInOutStockRecordRepository"/> class.
- /// </summary>
- /// <param name="dbContextProvider">The database context provider.</param>
- public EfCoreWmsInOutStockRecordRepository(IDbContextProvider<ICMSPluginDbContext> dbContextProvider)
- : base(dbContextProvider)
- {
- }
-
- /// <summary>
- /// 鎸夌収鍚嶇О鏌ユ壘鍑哄叆搴撹褰曡〃
- /// </summary>
- /// <param name="name"></param>
- /// <param name="cancellationToken"></param>
- /// <returns></returns>
- public virtual async Task<WmsInOutStockRecord> FindByNameAsync(string name, CancellationToken cancellationToken = default)
- {
- return await (await GetDbSetAsync())
- .IncludeDetails()
- .Where(x => !x.IsDeleted)
- .OrderBy(t => t.Sort)
- .FirstOrDefaultAsync(t => t.MaterialNo == name, GetCancellationToken(cancellationToken));
- }
-
- /// <summary>
- /// 楠岃瘉鍚嶇О鏄惁瀛樺湪鍑哄叆搴撹褰曡〃
- /// </summary>
- /// <param name="name">鏍￠獙鍊�</param>
- /// <param name="id"></param>
- /// <returns></returns>
- public async Task<bool> NameExistAsync(string name, Guid? id = null)
- {
- return await (await GetDbSetAsync()).WhereIf(id.HasValue, p => p.Id != id).Where(x => !x.IsDeleted).AnyAsync(x => x.MaterialNo == name);
- }
-
- /// <summary>
- /// 鑾峰彇鏈�澶ф帓搴忓嚭鍏ュ簱璁板綍琛�
- /// </summary>
- /// <returns></returns>
- public async Task<int> GetMaxSortAsync()
- {
- var hasAny = await (await GetQueryableAsync())
- .Where(x => !x.IsDeleted).AnyAsync();
- if (!hasAny)
- {
- return 1;
- }
-
- var sort = await (await GetQueryableAsync())
- .Where(x => !x.IsDeleted).MaxAsync(x => x.Sort);
- return sort + 1;
- }
-
- /// <summary>
- /// 鑾峰彇鍒嗛〉鍒楄〃鍑哄叆搴撹褰曡〃
- /// </summary>
- /// <param name="whereConditions"></param>
- /// <param name="sorting"></param>
- /// <param name="maxResultCount"></param>
- /// <param name="skipCount"></param>
- /// <param name="includeDetails"></param>
- /// <param name="cancellationToken"></param>
- /// <returns></returns>
- public async Task<List<WmsInOutStockRecord>> GetListAsync(FunReturnResultModel<Expression<Func<WmsInOutStockRecord, bool>>> whereConditions, string sorting = null, int maxResultCount = int.MaxValue, int skipCount = 0, bool includeDetails = false, CancellationToken cancellationToken = default)
- {
- return await (await GetDbSetAsync())
- .IncludeDetails(includeDetails)
- .WhereIf(whereConditions != null, whereConditions.data)
- .Where(x => !x.IsDeleted)
- .OrderBy(sorting.IsNullOrEmpty() ? nameof(WmsInOutStockRecord.Sort) : sorting)
- .PageBy(skipCount, maxResultCount)
- .ToListAsync(GetCancellationToken(cancellationToken));
- }
-
- /// <summary>
- /// 鑾峰彇鎬绘暟鍑哄叆搴撹褰曡〃
- /// </summary>
- /// <param name="whereConditions"></param>
- /// <param name="cancellationToken"></param>
- /// <returns></returns>
- public async Task<long> GetCountAsync(FunReturnResultModel<Expression<Func<WmsInOutStockRecord, bool>>> whereConditions, CancellationToken cancellationToken = default)
- {
- return await (await GetQueryableAsync())
- .WhereIf(whereConditions != null, whereConditions.data)
- .Where(x => !x.IsDeleted)
- .CountAsync(cancellationToken: GetCancellationToken(cancellationToken));
- }
-
-
- /// <inheritdoc />
- public override async Task<IQueryable<WmsInOutStockRecord>> WithDetailsAsync()
- {
- return (await GetQueryableAsync())
- .Where(x => !x.IsDeleted).IncludeDetails();
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsMaterialRepository.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsMaterialRepository.cs"
deleted file mode 100644
index 7a7edc1..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsMaterialRepository.cs"
+++ /dev/null
@@ -1,113 +0,0 @@
-using CMS.Plugin.HIAWms.Domain.WmsMaterial;
-using CMS.Plugin.HIAWms.EntityFrameworkCore.Extensions;
-using CmsQueryExtensions.Extension;
-using Microsoft.EntityFrameworkCore;
-using System.Linq.Dynamic.Core;
-using System.Linq.Expressions;
-using Volo.Abp.Domain.Repositories.EntityFrameworkCore;
-using Volo.Abp.EntityFrameworkCore;
-
-
-namespace CMS.Plugin.HIAWms.EntityFrameworkCore.Repositories;
-
-/// <summary>
-/// 鐗╂枡鍩虹淇℃伅琛ㄤ粨鍌ㄥ疄鐜�
-/// </summary>
-public class EfCoreWmsMaterialRepository : EfCoreRepository<ICMSPluginDbContext, WmsMaterial, Guid>, IWmsMaterialRepository
-{
- /// <summary>
- /// Initializes a new instance of the <see cref="EfCoreWmsMaterialRepository"/> class.
- /// </summary>
- /// <param name="dbContextProvider">The database context provider.</param>
- public EfCoreWmsMaterialRepository(IDbContextProvider<ICMSPluginDbContext> dbContextProvider)
- : base(dbContextProvider)
- {
- }
-
- /// <summary>
- /// 鎸夌収鍚嶇О鏌ユ壘鐗╂枡鍩虹淇℃伅琛�
- /// </summary>
- /// <param name="name"></param>
- /// <param name="cancellationToken"></param>
- /// <returns></returns>
- public virtual async Task<WmsMaterial> FindByNameAsync(string name, CancellationToken cancellationToken = default)
- {
- return await (await GetDbSetAsync())
- .IncludeDetails()
- .Where(x => !x.IsDeleted)
- .OrderBy(t => t.Sort)
- .FirstOrDefaultAsync(t => t.MaterialCode == name, GetCancellationToken(cancellationToken));
- }
-
- /// <summary>
- /// 楠岃瘉鍚嶇О鏄惁瀛樺湪鐗╂枡鍩虹淇℃伅琛�
- /// </summary>
- /// <param name="materialCode"></param>
- /// <param name="id"></param>
- /// <returns></returns>
- public async Task<bool> NameExistAsync(string materialCode, Guid? id = null)
- {
- return await (await GetDbSetAsync()).WhereIf(id.HasValue, p => p.Id != id).Where(x => !x.IsDeleted).AnyAsync(x => x.MaterialCode == materialCode);
- }
-
- /// <summary>
- /// 鑾峰彇鏈�澶ф帓搴忕墿鏂欏熀纭�淇℃伅琛�
- /// </summary>
- /// <returns></returns>
- public async Task<int> GetMaxSortAsync()
- {
- var hasAny = await (await GetQueryableAsync())
- .Where(x => !x.IsDeleted).AnyAsync();
- if (!hasAny)
- {
- return 1;
- }
-
- var sort = await (await GetQueryableAsync())
- .Where(x => !x.IsDeleted).MaxAsync(x => x.Sort);
- return sort + 1;
- }
-
- /// <summary>
- /// 鑾峰彇鍒嗛〉鍒楄〃鐗╂枡鍩虹淇℃伅琛�
- /// </summary>
- /// <param name="whereConditions"></param>
- /// <param name="sorting"></param>
- /// <param name="maxResultCount"></param>
- /// <param name="skipCount"></param>
- /// <param name="includeDetails"></param>
- /// <param name="cancellationToken"></param>
- /// <returns></returns>
- public async Task<List<WmsMaterial>> GetListAsync(FunReturnResultModel<Expression<Func<WmsMaterial, bool>>> whereConditions, string sorting = null, int maxResultCount = int.MaxValue, int skipCount = 0, bool includeDetails = false, CancellationToken cancellationToken = default)
- {
- return await (await GetDbSetAsync())
- .IncludeDetails(includeDetails)
- .WhereIf(whereConditions != null, whereConditions.data)
- .Where(x => !x.IsDeleted)
- .OrderBy(sorting.IsNullOrEmpty() ? nameof(WmsMaterial.Sort) : sorting)
- .PageBy(skipCount, maxResultCount)
- .ToListAsync(GetCancellationToken(cancellationToken));
- }
-
- /// <summary>
- /// 鑾峰彇鎬绘暟鐗╂枡鍩虹淇℃伅琛�
- /// </summary>
- /// <param name="whereConditions"></param>
- /// <param name="cancellationToken"></param>
- /// <returns></returns>
- public async Task<long> GetCountAsync(FunReturnResultModel<Expression<Func<WmsMaterial, bool>>> whereConditions, CancellationToken cancellationToken = default)
- {
- return await (await GetQueryableAsync())
- .WhereIf(whereConditions != null, whereConditions.data)
- .Where(x => !x.IsDeleted)
- .CountAsync(cancellationToken: GetCancellationToken(cancellationToken));
- }
-
-
- /// <inheritdoc />
- public override async Task<IQueryable<WmsMaterial>> WithDetailsAsync()
- {
- return (await GetQueryableAsync())
- .Where(x => !x.IsDeleted).IncludeDetails();
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsPlaceRepository.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsPlaceRepository.cs"
deleted file mode 100644
index cc36680..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsPlaceRepository.cs"
+++ /dev/null
@@ -1,104 +0,0 @@
-using System.Linq.Dynamic.Core;
-using CMS.Plugin.HIAWms.Domain.WmsPlaces;
-using CMS.Plugin.HIAWms.EntityFrameworkCore.Extensions;
-using Microsoft.AspNetCore.Components.Forms;
-using Microsoft.EntityFrameworkCore;
-using Volo.Abp.Domain.Repositories.EntityFrameworkCore;
-using Volo.Abp.EntityFrameworkCore;
-using Volo.Abp.Specifications;
-
-namespace CMS.Plugin.HIAWms.EntityFrameworkCore.Repositories;
-
-/// <inheritdoc />
-public class EfCoreWmsPlaceRepository : EfCoreRepository<ICMSPluginDbContext, WmsPlace, Guid>, IWmsPlaceRepository
-{
- /// <summary>
- /// Initializes a new instance of the <see cref="EfCoreWmsPlaceRepository"/> class.
- /// </summary>
- /// <param name="dbContextProvider">The database context provider.</param>
- public EfCoreWmsPlaceRepository(IDbContextProvider<ICMSPluginDbContext> dbContextProvider)
- : base(dbContextProvider)
- {
- }
-
- /// <inheritdoc />
- public virtual async Task<WmsPlace> FindByNameAsync(string name, CancellationToken cancellationToken = default)
- {
- return await (await GetDbSetAsync())
- .IncludeDetails()
- .Where(x => !x.IsDeleted)
- .OrderBy(t => t.Sort)
- .FirstOrDefaultAsync(t => t.PlaceNo == name, GetCancellationToken(cancellationToken));
- }
-
- /// <inheritdoc />
- public async Task<bool> NameExistAsync(string name, Guid? id = null)
- {
- return await (await GetDbSetAsync()).WhereIf(id.HasValue, p => p.Id != id).Where(x => !x.IsDeleted).AnyAsync(x => x.PlaceNo == name);
- }
-
- /// <inheritdoc />
- public async Task<int> GetMaxSortAsync()
- {
- var hasAny = await (await GetQueryableAsync())
- .Where(x => !x.IsDeleted).AnyAsync();
- if (!hasAny)
- {
- return 1;
- }
-
- var sort = await (await GetQueryableAsync())
- .Where(x => !x.IsDeleted).MaxAsync(x => x.Sort);
- return sort + 1;
- }
-
- /// <inheritdoc />
- public async Task<List<WmsPlace>> GetListAsync(WmsPlace? place, string sorting = null, int maxResultCount = int.MaxValue, int skipCount = 0, string filter = null, Specification<WmsPlace> specification = null, bool includeDetails = false, CancellationToken cancellationToken = default)
- {
- specification ??= new WmsPlaceSpecification();
- return await (await GetDbSetAsync())
- .IncludeDetails(includeDetails)
- .Where(specification.ToExpression())
- .WhereIf(!filter.IsNullOrWhiteSpace(), u => u.PlaceNo.Contains(filter))
- .WhereIf(!string.IsNullOrEmpty(place.PlaceNo), u => u.PlaceNo == place.PlaceNo)
- .WhereIf(place.PlaceStatus > 0, u => u.PlaceStatus == place.PlaceStatus)
- .WhereIf(place.StorageTypeNo > 0, u => u.StorageTypeNo == place.StorageTypeNo)
- .WhereIf(place.Aisle > 0, u => u.Aisle == place.Aisle)
- .WhereIf(place.RowNo > 0, u => u.RowNo == place.RowNo)
- .WhereIf(place.ColumnNo > 0, u => u.ColumnNo == place.ColumnNo)
- .WhereIf(place.LayerNo > 0, u => u.LayerNo == place.LayerNo)
- .WhereIf(place.Islock > 0, u => u.Islock == place.Islock)
- .WhereIf(place.EmptyContainer > 0, u => u.EmptyContainer == place.EmptyContainer)
- .Where(x => !x.IsDeleted)
- .OrderBy(sorting.IsNullOrEmpty() ? nameof(WmsPlace.Sort) : sorting)
- .PageBy(skipCount, maxResultCount)
- .ToListAsync(GetCancellationToken(cancellationToken));
- }
-
- /// <inheritdoc />
- public async Task<long> GetCountAsync(WmsPlace? place, string filter = null, Specification<WmsPlace> specification = null, CancellationToken cancellationToken = default)
- {
- specification ??= new WmsPlaceSpecification();
- return await (await GetQueryableAsync())
- .Where(specification.ToExpression())
- .WhereIf(!string.IsNullOrEmpty(place.PlaceNo), u => u.PlaceNo == place.PlaceNo)
- .WhereIf(place.PlaceStatus > 0, u => u.PlaceStatus == place.PlaceStatus)
- .WhereIf(place.StorageTypeNo > 0, u => u.StorageTypeNo == place.StorageTypeNo)
- .WhereIf(place.Aisle > 0, u => u.Aisle == place.Aisle)
- .WhereIf(place.RowNo > 0, u => u.RowNo == place.RowNo)
- .WhereIf(place.ColumnNo > 0, u => u.ColumnNo == place.ColumnNo)
- .WhereIf(place.LayerNo > 0, u => u.LayerNo == place.LayerNo)
- .WhereIf(place.Islock > 0, u => u.Islock == place.Islock)
- .WhereIf(place.EmptyContainer > 0, u => u.EmptyContainer == place.EmptyContainer)
- .Where(x => !x.IsDeleted)
- .WhereIf(!filter.IsNullOrWhiteSpace(), u => u.PlaceNo.Contains(filter))
- .CountAsync(cancellationToken: GetCancellationToken(cancellationToken));
- }
-
- /// <inheritdoc />
- public override async Task<IQueryable<WmsPlace>> WithDetailsAsync()
- {
- return (await GetQueryableAsync())
- .Where(x => !x.IsDeleted).IncludeDetails();
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsStoreRepository.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsStoreRepository.cs"
deleted file mode 100644
index 5895908..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsStoreRepository.cs"
+++ /dev/null
@@ -1,100 +0,0 @@
-using System.Linq.Dynamic.Core;
-using CMS.Plugin.HIAWms.Domain.WmsStores;
-using CMS.Plugin.HIAWms.EntityFrameworkCore.Extensions;
-using Microsoft.EntityFrameworkCore;
-using Volo.Abp.Domain.Repositories.EntityFrameworkCore;
-using Volo.Abp.EntityFrameworkCore;
-using Volo.Abp.Specifications;
-
-namespace CMS.Plugin.HIAWms.EntityFrameworkCore.Repositories;
-
-/// <inheritdoc />
-public class EfCoreWmsStoreRepository : EfCoreRepository<ICMSPluginDbContext, WmsStore, Guid>, IWmsStoreRepository
-{
- /// <summary>
- /// Initializes a new instance of the <see cref="EfCoreWmsStoreRepository"/> class.
- /// </summary>
- /// <param name="dbContextProvider">The database context provider.</param>
- public EfCoreWmsStoreRepository(IDbContextProvider<ICMSPluginDbContext> dbContextProvider)
- : base(dbContextProvider)
- {
- }
-
- /// <inheritdoc />
- public virtual async Task<WmsStore> FindByNameAsync(string name, CancellationToken cancellationToken = default)
- {
- return await (await GetDbSetAsync())
- .IncludeDetails()
- .Where(x => !x.IsDeleted)
- .OrderBy(t => t.Sort)
- .FirstOrDefaultAsync(t => t.StoreCode == name, GetCancellationToken(cancellationToken));
- }
-
- /// <inheritdoc />
- public async Task<bool> NameExistAsync(string storeCode, Guid? id = null)
- {
- return await (await GetDbSetAsync()).WhereIf(id.HasValue, p => p.Id != id).Where(x => !x.IsDeleted).AnyAsync(x => x.StoreCode == storeCode);
- }
-
- /// <inheritdoc />
- public async Task<int> GetMaxSortAsync()
- {
- var hasAny = await (await GetQueryableAsync())
- .Where(x => !x.IsDeleted).AnyAsync();
- if (!hasAny)
- {
- return 1;
- }
-
- var sort = await (await GetQueryableAsync())
- .Where(x => !x.IsDeleted).MaxAsync(x => x.Sort);
- return sort + 1;
- }
-
- /// <inheritdoc />
- public async Task<List<WmsStore>> GetListAsync(WmsStore? store, string sorting = null, int maxResultCount = int.MaxValue, int skipCount = 0, string filter = null, Specification<WmsStore> specification = null, bool includeDetails = false, CancellationToken cancellationToken = default)
- {
- specification ??= new WmsStoreSpecification();
- return await (await GetDbSetAsync())
- .IncludeDetails(includeDetails)
- .Where(specification.ToExpression())
- .Where(x => !x.IsDeleted)
- .WhereIf(!filter.IsNullOrWhiteSpace(), u => u.StoreCode.Contains(filter))
- .WhereIf(!string.IsNullOrEmpty(store.StoreCode),u=>u.StoreCode.Contains(store.StoreCode))
- .WhereIf(!string.IsNullOrEmpty(store.StoreName),u=>u.StoreName.Contains(store.StoreName))
- .OrderBy(sorting.IsNullOrEmpty() ? nameof(WmsStore.Sort) : sorting)
- .PageBy(skipCount, maxResultCount)
- .ToListAsync(GetCancellationToken(cancellationToken));
- }
-
- /// <summary>
- /// 查询仓库列表
- /// </summary>
- /// <param name="cancellationToken"></param>
- /// <returns></returns>
- public async Task<List<WmsStore>> GetListForSelectAsync( CancellationToken cancellationToken = default)
- {
- return await (await GetDbSetAsync())
- .ToListAsync(GetCancellationToken(cancellationToken));
- }
-
- /// <inheritdoc />
- public async Task<long> GetCountAsync(WmsStore? store, string filter = null, Specification<WmsStore> specification = null, CancellationToken cancellationToken = default)
- {
- specification ??= new WmsStoreSpecification();
- return await (await GetQueryableAsync())
- .Where(specification.ToExpression())
- .Where(x => !x.IsDeleted)
- .WhereIf(!filter.IsNullOrWhiteSpace(), u => u.StoreCode.Contains(filter))
- .WhereIf(!string.IsNullOrEmpty(store.StoreCode), u => u.StoreCode.Contains(store.StoreCode))
- .WhereIf(!string.IsNullOrEmpty(store.StoreName), u => u.StoreName.Contains(store.StoreName))
- .CountAsync(cancellationToken: GetCancellationToken(cancellationToken));
- }
-
- /// <inheritdoc />
- public override async Task<IQueryable<WmsStore>> WithDetailsAsync()
- {
- return (await GetQueryableAsync())
- .Where(x => !x.IsDeleted).IncludeDetails();
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.EntityFrameworkCore/appsettings.json" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.EntityFrameworkCore/appsettings.json"
deleted file mode 100644
index ebe0b8c..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.EntityFrameworkCore/appsettings.json"
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "ConnectionStrings": {
- "Default": "Server=localhost;Database=CMS.Plugin.HIAWms;User ID=root;Password=123abc.com"
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.MySQL/CMS.Plugin.HIAWms.MySQL.csproj" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.MySQL/CMS.Plugin.HIAWms.MySQL.csproj"
deleted file mode 100644
index bec4d76..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.MySQL/CMS.Plugin.HIAWms.MySQL.csproj"
+++ /dev/null
@@ -1,30 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
- <Import Project="../../common.props" />
- <Import Project="../../configureawait.props" />
-
- <PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
-
- </PropertyGroup>
-
- <ItemGroup>
- <PackageReference Include="Volo.Abp.EntityFrameworkCore.MySQL" Version="$(ABPPackageVersion)" />
- </ItemGroup>
-
- <ItemGroup>
- <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.5">
- <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
- <PrivateAssets>compile; contentFiles; build; buildMultitargeting; buildTransitive; analyzers; native</PrivateAssets>
- </PackageReference>
- </ItemGroup>
-
- <ItemGroup>
- <ProjectReference Include="..\CMS.Plugin.HIAWms.EntityFrameworkCore\CMS.Plugin.HIAWms.EntityFrameworkCore.csproj" />
- </ItemGroup>
-
- <ItemGroup>
- <Folder Include="Migrations\" />
- </ItemGroup>
-
-</Project>
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.MySQL/CMSPluginDbContext.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.MySQL/CMSPluginDbContext.cs"
deleted file mode 100644
index b93e817..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.MySQL/CMSPluginDbContext.cs"
+++ /dev/null
@@ -1,54 +0,0 @@
-using CMS.Plugin.HIAWms.EntityFrameworkCore.Extensions;
-using CMS.Plugin.HIAWms.Domain;
-using CMS.Plugin.HIAWms.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore;
-using Volo.Abp.Data;
-using Volo.Abp.EntityFrameworkCore;
-using Volo.Abp.EntityFrameworkCore.Modeling;
-
-namespace CMS.Plugin.HIAWms.MySQL;
-
-/// <summary>
-/// 鏁版嵁搴撲笂涓嬫枃
-/// </summary>
-[ConnectionStringName(CMSPluginDbProperties.ConnectionStringName)]
-public class CMSPluginDbContext : AbpDbContext<CMSPluginDbContext>, ICMSPluginDbContext
-{
- /* Add DbSet properties for your Aggregate Roots / Entities here. */
-
- /// <summary>
- /// Initializes a new instance of the <see cref="CMSPluginDbContext"/> class.
- /// </summary>
- /// <param name="options">The options.</param>
- public CMSPluginDbContext(DbContextOptions<CMSPluginDbContext> options)
- : base(options)
- {
- }
-
- /// <inheritdoc />
- protected override void OnModelCreating(ModelBuilder builder)
- {
- base.OnModelCreating(builder);
-
- /* Include modules to your migration db context */
-
- builder.ConfigureWmsContainer();
- builder.ConfigureWmsStore();
- builder.ConfigureWmsArea();
- builder.ConfigureWmsPlace();
- builder.ConfigureWmsMaterial();
- builder.ConfigureWmsInOutStockRecord();
- builder.ConfigureWmsTask();
-
- /* Configure your own tables/entities inside here */
-
- //builder.Entity<YourEntity>(b =>
- //{
- // b.ToTable(CMSPluginDbProperties.DbTablePrefix + "YourEntities", CMSPluginDbProperties.DbSchema);
- // b.ConfigureByConvention(); //auto configure for the base class props
- // //...
- //});
-
- builder.TryConfigureObjectExtensions<CMSPluginDbContext>();
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.MySQL/CMSPluginDbContextFactory.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.MySQL/CMSPluginDbContextFactory.cs"
deleted file mode 100644
index e19d33d..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.MySQL/CMSPluginDbContextFactory.cs"
+++ /dev/null
@@ -1,43 +0,0 @@
-using CMS.Plugin.HIAWms.Domain;
-using CMS.Plugin.HIAWms.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Design;
-using Microsoft.Extensions.Configuration;
-
-namespace CMS.Plugin.HIAWms.MySQL;
-
-/// <summary>
-/// This class is needed for EF Core console commands
-/// (like Add-Migration and Update-Database commands)
-/// </summary>
-public class CMSPluginDbContextFactory : IDesignTimeDbContextFactory<CMSPluginDbContext>
-{
- /// <summary>
- /// Creates a new instance of a derived context.
- /// </summary>
- /// <param name="args">Arguments provided by the design-time service.</param>
- public CMSPluginDbContext CreateDbContext(string[] args)
- {
- CMSPluginEfCoreEntityExtensionMappings.Configure();
-
- var configuration = BuildConfiguration();
-
- var builder = new DbContextOptionsBuilder<CMSPluginDbContext>()
- .UseMySql(configuration.GetConnectionString("Default"), MySqlServerVersion.LatestSupportedServerVersion, x => x.MigrationsHistoryTable(CMSPluginDbProperties.MigrationsHistoryTable, CMSPluginDbProperties.DbSchema));
-
- return new CMSPluginDbContext(builder.Options);
- }
-
- /// <summary>
- /// Builds the configuration.
- /// </summary>
- /// <returns></returns>
- private static IConfigurationRoot BuildConfiguration()
- {
- var builder = new ConfigurationBuilder()
- .SetBasePath(Path.Combine(Directory.GetCurrentDirectory(), "../CMS.Plugin.HIAWms.EntityFrameworkCore/"))
- .AddJsonFile("appsettings.json", optional: false);
-
- return builder.Build();
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.MySQL/CMSPluginMySQLModule.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.MySQL/CMSPluginMySQLModule.cs"
deleted file mode 100644
index b68bb3f..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.MySQL/CMSPluginMySQLModule.cs"
+++ /dev/null
@@ -1,42 +0,0 @@
-using CMS.Plugin.HIAWms.Domain;
-using CMS.Plugin.HIAWms.EntityFrameworkCore;
-using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp.EntityFrameworkCore;
-using Volo.Abp.Modularity;
-
-namespace CMS.Plugin.HIAWms.MySQL;
-
-/// <summary>
-/// EntityFrameworkCore妯″潡
-/// </summary>
-[DependsOn(typeof(CMSPluginEntityFrameworkCoreModule))]
-public class CMSPluginMySQLModule : AbpModule
-{
- /// <inheritdoc />
- public override void PreConfigureServices(ServiceConfigurationContext context)
- {
- CMSPluginEfCoreEntityExtensionMappings.Configure();
- }
-
- /// <inheritdoc />
- public override void ConfigureServices(ServiceConfigurationContext context)
- {
- context.Services.AddAbpDbContext<CMSPluginDbContext>(options =>
- {
- /* Remove "includeAllEntities: true" to create
- * default repositories only for aggregate roots */
- //options.AddDefaultRepositories(includeAllEntities: true);
- });
-
- Configure<AbpDbContextOptions>(options =>
- {
- /* The main point to change your DBMS.
- * See also CMSMigrationsDbContextFactory for EF Core tooling. */
- options.UseMySQL(x =>
- {
- x.MigrationsHistoryTable(CMSPluginDbProperties.MigrationsHistoryTable, CMSPluginDbProperties.DbSchema);
- //x.EnableRetryOnFailure();
- });
- });
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.MySQL/Scripts/UpdateMigrations.bat" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.MySQL/Scripts/UpdateMigrations.bat"
deleted file mode 100644
index 101a898..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.MySQL/Scripts/UpdateMigrations.bat"
+++ /dev/null
@@ -1,6 +0,0 @@
-cd ../
-dotnet ef migrations add InitialCreate1 -c CMSPluginDbContext -o Migrations
-::dotnet ef migrations add Update1 -c CMSPluginDbContext -o Migrations
-::dotnet ef migrations add Update2 -c CMSPluginDbContext -o Migrations
-::dotnet ef migrations add Update3 -c CMSPluginDbContext -o Migrations
-cmd
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.PostgreSql/CMS.Plugin.HIAWms.PostgreSql.csproj" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.PostgreSql/CMS.Plugin.HIAWms.PostgreSql.csproj"
deleted file mode 100644
index daa1e99..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.PostgreSql/CMS.Plugin.HIAWms.PostgreSql.csproj"
+++ /dev/null
@@ -1,30 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
- <Import Project="../../common.props" />
- <Import Project="../../configureawait.props" />
-
- <PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
-
- </PropertyGroup>
-
- <ItemGroup>
- <PackageReference Include="Volo.Abp.EntityFrameworkCore.PostgreSql" Version="$(ABPPackageVersion)" />
- </ItemGroup>
-
- <ItemGroup>
- <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.5">
- <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
- <PrivateAssets>compile; contentFiles; build; buildMultitargeting; buildTransitive; analyzers; native</PrivateAssets>
- </PackageReference>
- </ItemGroup>
-
- <ItemGroup>
- <ProjectReference Include="..\CMS.Plugin.HIAWms.EntityFrameworkCore\CMS.Plugin.HIAWms.EntityFrameworkCore.csproj" />
- </ItemGroup>
-
- <ItemGroup>
- <Folder Include="Migrations\" />
- </ItemGroup>
-
-</Project>
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.PostgreSql/CMSPluginDbContext.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.PostgreSql/CMSPluginDbContext.cs"
deleted file mode 100644
index 5ba375d..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.PostgreSql/CMSPluginDbContext.cs"
+++ /dev/null
@@ -1,51 +0,0 @@
-using CMS.Plugin.HIAWms.EntityFrameworkCore.Extensions;
-using CMS.Plugin.HIAWms.Domain;
-using CMS.Plugin.HIAWms.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore;
-using Volo.Abp.Data;
-using Volo.Abp.EntityFrameworkCore;
-using Volo.Abp.EntityFrameworkCore.Modeling;
-
-namespace CMS.Plugin.HIAWms.PostgreSql;
-
-/// <summary>
-/// 鏁版嵁搴撲笂涓嬫枃
-/// </summary>
-[ConnectionStringName(CMSPluginDbProperties.ConnectionStringName)]
-public class CMSPluginDbContext : AbpDbContext<CMSPluginDbContext>, ICMSPluginDbContext
-{
- /* Add DbSet properties for your Aggregate Roots / Entities here. */
-
- /// <summary>
- /// Initializes a new instance of the <see cref="CMSPluginDbContext"/> class.
- /// </summary>
- /// <param name="options">The options.</param>
- public CMSPluginDbContext(DbContextOptions<CMSPluginDbContext> options)
- : base(options)
- {
- }
-
- /// <inheritdoc />
- protected override void OnModelCreating(ModelBuilder builder)
- {
- base.OnModelCreating(builder);
-
- /* Include modules to your migration db context */
-
- builder.ConfigureWmsContainer();
- builder.ConfigureWmsStore();
- builder.ConfigureWmsArea();
- builder.ConfigureWmsPlace();
- builder.ConfigureWmsMaterial();
- /* Configure your own tables/entities inside here */
-
- //builder.Entity<YourEntity>(b =>
- //{
- // b.ToTable(CMSPluginDbProperties.DbTablePrefix + "YourEntities", CMSPluginDbProperties.DbSchema);
- // b.ConfigureByConvention(); //auto configure for the base class props
- // //...
- //});
-
- builder.TryConfigureObjectExtensions<CMSPluginDbContext>();
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.PostgreSql/CMSPluginDbContextFactory.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.PostgreSql/CMSPluginDbContextFactory.cs"
deleted file mode 100644
index 5c646d0..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.PostgreSql/CMSPluginDbContextFactory.cs"
+++ /dev/null
@@ -1,43 +0,0 @@
-using CMS.Plugin.HIAWms.Domain;
-using CMS.Plugin.HIAWms.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Design;
-using Microsoft.Extensions.Configuration;
-
-namespace CMS.Plugin.HIAWms.PostgreSql;
-
-/// <summary>
-/// This class is needed for EF Core console commands
-/// (like Add-Migration and Update-Database commands)
-/// </summary>
-public class CMSPluginDbContextFactory : IDesignTimeDbContextFactory<CMSPluginDbContext>
-{
- /// <summary>
- /// Creates a new instance of a derived context.
- /// </summary>
- /// <param name="args">Arguments provided by the design-time service.</param>
- public CMSPluginDbContext CreateDbContext(string[] args)
- {
- CMSPluginEfCoreEntityExtensionMappings.Configure();
-
- var configuration = BuildConfiguration();
-
- var builder = new DbContextOptionsBuilder<CMSPluginDbContext>()
- .UseNpgsql(configuration.GetConnectionString("Default"), x => x.MigrationsHistoryTable(CMSPluginDbProperties.MigrationsHistoryTable, CMSPluginDbProperties.DbSchema));
-
- return new CMSPluginDbContext(builder.Options);
- }
-
- /// <summary>
- /// Builds the configuration.
- /// </summary>
- /// <returns></returns>
- private static IConfigurationRoot BuildConfiguration()
- {
- var builder = new ConfigurationBuilder()
- .SetBasePath(Path.Combine(Directory.GetCurrentDirectory(), "../CMS.Plugin.HIAWms.EntityFrameworkCore/"))
- .AddJsonFile("appsettings.json", optional: false);
-
- return builder.Build();
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.PostgreSql/CMSPluginPostgreSqlModule.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.PostgreSql/CMSPluginPostgreSqlModule.cs"
deleted file mode 100644
index f086a7e..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.PostgreSql/CMSPluginPostgreSqlModule.cs"
+++ /dev/null
@@ -1,42 +0,0 @@
-using CMS.Plugin.HIAWms.Domain;
-using CMS.Plugin.HIAWms.EntityFrameworkCore;
-using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp.EntityFrameworkCore;
-using Volo.Abp.Modularity;
-
-namespace CMS.Plugin.HIAWms.PostgreSql;
-
-/// <summary>
-/// EntityFrameworkCore妯″潡
-/// </summary>
-[DependsOn(typeof(CMSPluginEntityFrameworkCoreModule))]
-public class CMSPluginPostgreSqlModule : AbpModule
-{
- /// <inheritdoc />
- public override void PreConfigureServices(ServiceConfigurationContext context)
- {
- CMSPluginEfCoreEntityExtensionMappings.Configure();
- }
-
- /// <inheritdoc />
- public override void ConfigureServices(ServiceConfigurationContext context)
- {
- context.Services.AddAbpDbContext<CMSPluginDbContext>(options =>
- {
- /* Remove "includeAllEntities: true" to create
- * default repositories only for aggregate roots */
- //options.AddDefaultRepositories(includeAllEntities: true);
- });
-
- Configure<AbpDbContextOptions>(options =>
- {
- /* The main point to change your DBMS.
- * See also CMSMigrationsDbContextFactory for EF Core tooling. */
- options.UseNpgsql(x =>
- {
- x.MigrationsHistoryTable(CMSPluginDbProperties.MigrationsHistoryTable, CMSPluginDbProperties.DbSchema);
- //x.EnableRetryOnFailure();
- });
- });
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.SqlServer/CMS.Plugin.HIAWms.SqlServer.csproj" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.SqlServer/CMS.Plugin.HIAWms.SqlServer.csproj"
deleted file mode 100644
index ad78ae6..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.SqlServer/CMS.Plugin.HIAWms.SqlServer.csproj"
+++ /dev/null
@@ -1,30 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
- <Import Project="../../common.props" />
- <Import Project="../../configureawait.props" />
-
- <PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
-
- </PropertyGroup>
-
- <ItemGroup>
- <PackageReference Include="Volo.Abp.EntityFrameworkCore.SqlServer" Version="$(ABPPackageVersion)" />
- </ItemGroup>
-
- <ItemGroup>
- <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.5">
- <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
- <PrivateAssets>compile; contentFiles; build; buildMultitargeting; buildTransitive; analyzers; native</PrivateAssets>
- </PackageReference>
- </ItemGroup>
-
- <ItemGroup>
- <ProjectReference Include="..\CMS.Plugin.HIAWms.EntityFrameworkCore\CMS.Plugin.HIAWms.EntityFrameworkCore.csproj" />
- </ItemGroup>
-
- <ItemGroup>
- <Folder Include="Migrations\" />
- </ItemGroup>
-
-</Project>
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.SqlServer/CMSPluginDbContext.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.SqlServer/CMSPluginDbContext.cs"
deleted file mode 100644
index 5c9a9e7..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.SqlServer/CMSPluginDbContext.cs"
+++ /dev/null
@@ -1,52 +0,0 @@
-using CMS.Plugin.HIAWms.Domain;
-using CMS.Plugin.HIAWms.EntityFrameworkCore.Extensions;
-using CMS.Plugin.HIAWms.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore;
-using Volo.Abp.Data;
-using Volo.Abp.EntityFrameworkCore;
-using Volo.Abp.EntityFrameworkCore.Modeling;
-
-namespace CMS.Plugin.HIAWms.SqlServer;
-
-/// <summary>
-/// 鏁版嵁搴撲笂涓嬫枃
-/// </summary>
-[ConnectionStringName(CMSPluginDbProperties.ConnectionStringName)]
-public class CMSPluginDbContext : AbpDbContext<CMSPluginDbContext>, ICMSPluginDbContext
-{
- /* Add DbSet properties for your Aggregate Roots / Entities here. */
-
- /// <summary>
- /// Initializes a new instance of the <see cref="CMSPluginDbContext"/> class.
- /// </summary>
- /// <param name="options">The options.</param>
- public CMSPluginDbContext(DbContextOptions<CMSPluginDbContext> options)
- : base(options)
- {
- }
-
- /// <inheritdoc />
- protected override void OnModelCreating(ModelBuilder builder)
- {
- base.OnModelCreating(builder);
-
- /* Include modules to your migration db context */
-
- builder.ConfigureWmsContainer();
- builder.ConfigureWmsStore();
- builder.ConfigureWmsArea();
- builder.ConfigureWmsPlace();
- builder.ConfigureWmsMaterial();
-
- /* Configure your own tables/entities inside here */
-
- //builder.Entity<YourEntity>(b =>
- //{
- // b.ToTable(CMSPluginDbProperties.DbTablePrefix + "YourEntities", CMSPluginDbProperties.DbSchema);
- // b.ConfigureByConvention(); //auto configure for the base class props
- // //...
- //});
-
- builder.TryConfigureObjectExtensions<CMSPluginDbContext>();
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.SqlServer/CMSPluginDbContextFactory.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.SqlServer/CMSPluginDbContextFactory.cs"
deleted file mode 100644
index 7739f53..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.SqlServer/CMSPluginDbContextFactory.cs"
+++ /dev/null
@@ -1,43 +0,0 @@
-using CMS.Plugin.HIAWms.Domain;
-using CMS.Plugin.HIAWms.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Design;
-using Microsoft.Extensions.Configuration;
-
-namespace CMS.Plugin.HIAWms.SqlServer;
-
-/// <summary>
-/// This class is needed for EF Core console commands
-/// (like Add-Migration and Update-Database commands)
-/// </summary>
-public class CMSPluginDbContextFactory : IDesignTimeDbContextFactory<CMSPluginDbContext>
-{
- /// <summary>
- /// Creates a new instance of a derived context.
- /// </summary>
- /// <param name="args">Arguments provided by the design-time service.</param>
- public CMSPluginDbContext CreateDbContext(string[] args)
- {
- CMSPluginEfCoreEntityExtensionMappings.Configure();
-
- var configuration = BuildConfiguration();
-
- var builder = new DbContextOptionsBuilder<CMSPluginDbContext>()
- .UseSqlServer(configuration.GetConnectionString("Default"), x => x.MigrationsHistoryTable(CMSPluginDbProperties.MigrationsHistoryTable, CMSPluginDbProperties.DbSchema));
-
- return new CMSPluginDbContext(builder.Options);
- }
-
- /// <summary>
- /// Builds the configuration.
- /// </summary>
- /// <returns></returns>
- private static IConfigurationRoot BuildConfiguration()
- {
- var builder = new ConfigurationBuilder()
- .SetBasePath(Path.Combine(Directory.GetCurrentDirectory(), "../CMS.Plugin.HIAWms.EntityFrameworkCore/"))
- .AddJsonFile("appsettings.json", optional: false);
-
- return builder.Build();
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.SqlServer/CMSPluginSqlServerModule.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.SqlServer/CMSPluginSqlServerModule.cs"
deleted file mode 100644
index 918d20e..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.SqlServer/CMSPluginSqlServerModule.cs"
+++ /dev/null
@@ -1,42 +0,0 @@
-using CMS.Plugin.HIAWms.Domain;
-using CMS.Plugin.HIAWms.EntityFrameworkCore;
-using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp.EntityFrameworkCore;
-using Volo.Abp.Modularity;
-
-namespace CMS.Plugin.HIAWms.SqlServer;
-
-/// <summary>
-/// EntityFrameworkCore妯″潡
-/// </summary>
-[DependsOn(typeof(CMSPluginEntityFrameworkCoreModule))]
-public class CMSPluginSqlServerModule : AbpModule
-{
- /// <inheritdoc />
- public override void PreConfigureServices(ServiceConfigurationContext context)
- {
- CMSPluginEfCoreEntityExtensionMappings.Configure();
- }
-
- /// <inheritdoc />
- public override void ConfigureServices(ServiceConfigurationContext context)
- {
- context.Services.AddAbpDbContext<CMSPluginDbContext>(options =>
- {
- /* Remove "includeAllEntities: true" to create
- * default repositories only for aggregate roots */
- //options.AddDefaultRepositories(includeAllEntities: true);
- });
-
- Configure<AbpDbContextOptions>(options =>
- {
- /* The main point to change your DBMS.
- * See also CMSMigrationsDbContextFactory for EF Core tooling. */
- options.UseSqlServer(x =>
- {
- x.MigrationsHistoryTable(CMSPluginDbProperties.MigrationsHistoryTable, CMSPluginDbProperties.DbSchema);
- //x.EnableRetryOnFailure();
- });
- });
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/Apis/IHIAWmsExternalApi.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/Apis/IHIAWmsExternalApi.cs"
deleted file mode 100644
index 507d8c0..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/Apis/IHIAWmsExternalApi.cs"
+++ /dev/null
@@ -1,18 +0,0 @@
-using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsContainers;
-using WebApiClientCore.Attributes;
-
-namespace CMS.Plugin.HIAWms.Apis
-{
- /// <summary>
- /// 澶栭儴Http API瀵规帴 // https://webapiclient.github.io/guide/getting-started.html
- /// </summary>
- public interface IHIAWmsExternalApi
- {
- /// <summary>
- /// CreateAsync
- /// </summary>
- /// <returns></returns>
- [HttpPost("api/v1/hiawms/wmscontainer")]
- Task<WmsContainerDto> CreateAsync([JsonContent] WmsContainerCreateDto input);
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/CMS.Plugin.UtilityApi.csproj" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/CMS.Plugin.UtilityApi.csproj"
deleted file mode 100644
index 6b49128..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/CMS.Plugin.UtilityApi.csproj"
+++ /dev/null
@@ -1,73 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
- <Import Project="../../common.props" />
- <Import Project="../../configureawait.props" />
-
- <PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
- <EnableDynamicLoading>true</EnableDynamicLoading>
- <ProduceReferenceAssembly>false</ProduceReferenceAssembly>
- <GenerateDocumentationFile>true</GenerateDocumentationFile>
- </PropertyGroup>
-
- <PropertyGroup Condition="$([MSBuild]::IsOSPlatform('Windows'))">
- <CMSRootPath>D:\Program Files\CMS Editor</CMSRootPath>
- <OutputPath>$(CMSRootPath)\plugins\cms.plugin.hiawms</OutputPath>
- </PropertyGroup>
-
- <PropertyGroup Condition="$([MSBuild]::IsOSPlatform('OSX'))">
- <CMSRootPath>/Volumes/SSD/CMS Editor</CMSRootPath>
- <OutputPath>$(CMSRootPath)\plugins\cms.plugin.hiawms</OutputPath>
- </PropertyGroup>
-
- <ItemGroup>
- <None Remove="appsettings.json" />
- <None Remove="Flows\50001_1.pfd" />
- <None Remove="Flows\FlowInfo.xml" />
- <None Remove="Resources\Templates\WmsContainer瀵煎嚭妯℃澘.xlsx" />
- </ItemGroup>
-
- <ItemGroup>
- <Content Include="appsettings.json">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
- </ItemGroup>
-
- <ItemGroup>
- <EmbeddedResource Include="Resources\Templates\WmsContainer瀵煎嚭妯℃澘.xlsx">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </EmbeddedResource>
- </ItemGroup>
-
- <ItemGroup>
- <PackageReference Include="CMS.Framework.AspNetCore" Version="2.16.1" />
- <PackageReference Include="CMS.Extensions.Variable" Version="2.16.1" />
- <PackageReference Include="CMS.Extensions.Data" Version="2.16.1" />
- <PackageReference Include="CMS.Data.Stressing" Version="2.16.1" />
- <PackageReference Include="CMS.Extensions.Abp" Version="1.4.0" />
- <PackageReference Include="WebApiClientCore" Version="2.0.4" />
- </ItemGroup>
-
- <ItemGroup>
- <ProjectReference Include="..\CMS.Plugin.HIAWms.Application\CMS.Plugin.HIAWms.Application.csproj" />
- <ProjectReference Include="..\CMS.Plugin.HIAWms.MySQL\CMS.Plugin.HIAWms.MySQL.csproj" />
- <ProjectReference Include="..\CMS.Plugin.HIAWms.PostgreSql\CMS.Plugin.HIAWms.PostgreSql.csproj" />
- <ProjectReference Include="..\CMS.Plugin.HIAWms.SqlServer\CMS.Plugin.HIAWms.SqlServer.csproj" />
- </ItemGroup>
-
- <ItemGroup>
- <Reference Include="CmsQueryExtensions">
- <HintPath>..\..\..\..\CommonDLL\CmsQueryExtensions.dll</HintPath>
- </Reference>
- </ItemGroup>
-
- <ItemGroup>
- <Resource Include="Flows\50001_1.pfd">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Resource>
- <Resource Include="Flows\FlowInfo.xml">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Resource>
- </ItemGroup>
-
-</Project>
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/CMSPluginEntry.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/CMSPluginEntry.cs"
deleted file mode 100644
index e202459..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/CMSPluginEntry.cs"
+++ /dev/null
@@ -1,109 +0,0 @@
-using System.Collections;
-using Autofac;
-using CMS.Data.Stressing;
-using CMS.DataPersistence;
-using CMS.DataPersistence.Data;
-using CMS.Extensions.Abp.Autofac.Extensions.DependencyInjection;
-using CMS.Plugin.MesSuite.Abstractions;
-using CMS.Plugin.MesSuite.Abstractions.Consts;
-using CMS.Plugin.HIAWms.Abstractions;
-using CMS.Plugin.HIAWms.Apis;
-using CMS.Plugin.HIAWms.Domain;
-using CMS.Plugin.HIAWms.ProjectService;
-using CMS.Plugin.HIAWms.Workers;
-using CMS.Plugin.HIAWms.Apis;
-using CMS.Project.Abstractions;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.Extensions.DependencyInjection;
-using Structing.AspNetCore;
-using Structing.Core;
-using Structing.Web;
-using SYC.Plugin;
-using Volo.Abp.BackgroundWorkers;
-using Volo.Abp.DependencyInjection;
-using Volo.Abp.Modularity.PlugIns;
-
-namespace CMS.Plugin.HIAWms;
-
-/// <summary>
-/// CMS鎻掍欢鍏ュ彛锛屼娇鐢�<see cref="EnableApplicationPartAttribute"/>灏嗗鍏ontroller.
-/// </summary>
-[EnableApplicationPart]
-public class CMSPluginEntry : PluginEntry
-{
- private readonly IServiceCollection _service = new ServiceCollection();
-
- /// <inheritdoc />
- public override void Register(IRegisteContext context)
- {
- var configuration = context.Features.GetConfiguration();
-
- // 閰嶇疆澶栭儴HttpApi锛� https://webapiclient.github.io/
- context.Services
- .AddHttpApi<IHIAWmsExternalApi>()
- .ConfigureHttpApi(configuration.GetSection(nameof(IHIAWmsExternalApi)));
-
- context.Services.TryAddHIAWms();
-
- context.Services.AddScoped<IProjectRuntimeMigrator, CMSPluginRuntimeMigrator>();
- context.Services.AddSingleton<IProjectService, HIAWmsProjectService>();
-
- context.Services.AddScoped<IEFDataProvider>(p =>
- {
- var cfg = p.GetRequiredService<IDataRuntimeConfig>();
- return new DefaultEFDataProvider(CMSPluginMesSuiteOptions.DataProviderName, CMSPluginMesSuiteOptions.GetDatabaseSuffix(CMSPluginDbProperties.MigrationsHistoryTable), CMSPluginDbProperties.MigrationsHistoryTable, cfg);
- });
-
- _service.AddObjectAccessor<IApplicationBuilder>();
- _service.AddApplication<CMSPluginModule>(options =>
- {
- var databaseType = configuration[SectionName.DatabaseType] ?? "mysql";
- if (KnowsDbCode.IsMysql(databaseType))
- {
- options.PlugInSources.Add(new TypePlugInSource(
- typeof(MySQL.CMSPluginMySQLModule)
- ));
- }
- else if (KnowsDbCode.IsSqlServer(databaseType))
- {
- options.PlugInSources.Add(new TypePlugInSource(
- typeof(SqlServer.CMSPluginSqlServerModule)
- ));
- }
- else if (KnowsDbCode.IsPostgreSql(databaseType))
- {
- options.PlugInSources.Add(new TypePlugInSource(
- typeof(PostgreSql.CMSPluginPostgreSqlModule)
- ));
- }
- });
-
- base.Register(context);
- }
-
- /// <inheritdoc />
- public override void ConfigureContainer(ContainerBuilder builder)
- {
- builder.Populate(_service);
-
- base.ConfigureContainer(builder);
- }
-
- /// <inheritdoc />
- public override async Task ReadyAsync(IReadyContext context)
- {
- context.Provider.GetRequiredService<ObjectAccessor<IApplicationBuilder>>().Value = context.Features.GetApplicationBuilder();
- var app = context.Features.GetApplicationBuilder();
- await app.InitializeApplicationAsync();
-
- await base.ReadyAsync(context);
- }
-
- /// <inheritdoc />
- public override async Task AfterReadyAsync(IReadyContext context)
- {
- await context.GetRequiredService<IBackgroundWorkerManager>().AddAsync(context.GetRequiredService<HIAWmsWorker>());
-
- await base.AfterReadyAsync(context);
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/CMSPluginModule.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/CMSPluginModule.cs"
deleted file mode 100644
index 22c27e2..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/CMSPluginModule.cs"
+++ /dev/null
@@ -1,42 +0,0 @@
-using System.Reflection;
-using CMS.Extensions.Abp;
-using CMS.Extensions.Abp.AspNetCore;
-using CMS.Plugin.HIAWms.Abstractions;
-using CMS.Plugin.HIAWms.Application;
-using CMS.Plugin.HIAWms.EntityFrameworkCore;
-using CMS.Plugin.HIAWms.Jobs;
-using Volo.Abp.BackgroundJobs;
-using Volo.Abp.Modularity;
-
-namespace CMS.Plugin.HIAWms
-{
- /// <summary>
- /// CMS 鎻掍欢渚濊禆鍔犺浇鍚姩妯″潡
- /// </summary>
- [DependsOn(
- typeof(CMSPluginAbpModule),
- typeof(CMSPluginAbpAspNetCoreModule),
- typeof(CMSPluginApplicationModule),
- typeof(CMSPluginEntityFrameworkCoreModule)
- )]
- public class CMSPluginModule : AbpStartupModule
- {
- /// <inheritdoc />
- public override void ConfigureServices(ServiceConfigurationContext context)
- {
- Configure<AbpBackgroundJobOptions>(options =>
- {
- options.AddJob<HIAWmsJob>();
- });
- }
-
- /// <inheritdoc />
- public override Assembly[]? GetSharedAssemblies()
- {
- return base.GetSharedAssemblies().Concat(new[]
- {
- typeof(CMSPluginHIAWmsAbstractionsModule).Assembly,
- }).ToArray();
- }
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/CMSPluginRuntimeMigrator.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/CMSPluginRuntimeMigrator.cs"
deleted file mode 100644
index 59fade5..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/CMSPluginRuntimeMigrator.cs"
+++ /dev/null
@@ -1,46 +0,0 @@
-using CMS.Plugin.HIAWms.Domain.Data;
-using CMS.Project.Abstractions;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using Volo.Abp.DependencyInjection;
-
-namespace CMS.Plugin.HIAWms
-{
- /// <summary>
- /// 宸ョ▼鏁版嵁搴撹縼绉诲櫒锛屽綋<see cref="IProjectRunner"/>鍔犺浇宸ョ▼鏃舵瀵硅薄浼氳鍒涘缓璋冪敤
- /// </summary>
- public class CMSPluginRuntimeMigrator : IProjectRuntimeMigrator
- {
- /// <summary>
- /// 鎵ц杩佺Щ
- /// </summary>
- /// <param name="project">褰撳墠瑕佽繍琛岀殑宸ョ▼</param>
- /// <param name="serviceProvider">瀛樺湪杩愯宸ョ▼涓婁笅鏂囩殑serviceProvider</param>
- /// <returns></returns>
- public async Task UpgradeAsync(Project.Project project, IServiceProvider serviceProvider)
- {
- var objectAccessor = serviceProvider.GetService<ObjectAccessor<Project.Project>>();
- if (objectAccessor != null)
- {
- objectAccessor.Value = project;
- }
-
- var logger = serviceProvider.GetRequiredService<ILogger<CMSPluginRuntimeMigrator>>();
- try
- {
- // 閫氳繃serviceProvider鑾峰彇鑷繁鐨凞bContext骞惰繘琛屽垱寤烘垨杩佺Щ娴佺▼
- logger.LogInformation($"Start {project.Info.Id} HIAWms dbcontext create");
- await serviceProvider.GetRequiredService<CMSPluginDbMigrationService>().MigrateAsync();
- }
- catch (Exception ex)
- {
- logger.LogError(ex, "Create HIAWms db failed");
- }
-
- if (objectAccessor != null)
- {
- objectAccessor.Value = null;
- }
- }
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/Controller/WmsAreaController.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/Controller/WmsAreaController.cs"
deleted file mode 100644
index 7efc248..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/Controller/WmsAreaController.cs"
+++ /dev/null
@@ -1,187 +0,0 @@
-using Ao.Lang;
-using CMS.Extensions.Abp.AspNetCore.Mvc.Filters;
-using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsAreas;
-using CMS.Plugin.HIAWms.Application.Contracts.Services;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using MiniExcelLibs;
-using System.Reflection;
-using Volo.Abp;
-using Volo.Abp.Application.Dtos;
-
-namespace CMS.Plugin.HIAWms.Controller
-{
- /// <summary>
- /// WmsArea鏈嶅姟
- /// </summary>
- [ApiController]
- [TypeFilter(typeof(CMSLanguageFilter))]
- [TypeFilter(typeof(CMSUowActionFilter))]
- [TypeFilter(typeof(CMSAuditActionFilter))]
- [TypeFilter(typeof(CMSExceptionFilter))]
- [Route("api/v{version:apiVersion}/HIAWms/[controller]")]
- public class WmsAreaController : ControllerBase
- {
- private readonly IWmsAreaAppService _wmsareaAppService;
-
- /// <summary>
- /// Initializes a new instance of the <see cref="WmsAreaController"/> class.
- /// </summary>
- /// <param name="wmsareaAppService">The wmsarea application service.</param>
- public WmsAreaController(IWmsAreaAppService wmsareaAppService)
- {
- _wmsareaAppService = wmsareaAppService;
- }
-
- /// <summary>
- /// 鑾峰彇wmsarea.
- /// </summary>
- /// <param name="id">鏍囪瘑绗�.</param>
- /// <returns></returns>
- [HttpGet]
- [Route("{id}")]
- public virtual Task<WmsAreaDto> GetAsync(Guid id)
- {
- return _wmsareaAppService.GetAsync(id);
- }
-
- /// <summary>
- /// 鑾峰彇wmsarea鐨勫垪琛�.
- /// </summary>
- /// <param name="input">杈撳叆.</param>
- /// <returns></returns>
- [HttpGet]
- public virtual Task<PagedResultDto<WmsAreaDto>> GetListAsync([FromQuery] GetWmsAreasInput input)
- {
- return _wmsareaAppService.GetListAsync(input);
- }
-
- /// <summary>
- /// 鍒涘缓wmsarea.
- /// </summary>
- /// <param name="input">杈撳叆.</param>
- /// <returns></returns>
- //[Authorize]
- [HttpPost]
- public virtual Task<WmsAreaDto> CreateAsync(WmsAreaCreateDto input)
- {
- return _wmsareaAppService.CreateAsync(input);
- }
-
- /// <summary>
- /// 鏇存柊wmsarea.
- /// </summary>
- /// <param name="id">鏍囪瘑绗�.</param>
- /// <param name="input">杈撳叆.</param>
- /// <returns></returns>
- //[Authorize]
- [HttpPut]
- [Route("{id}")]
- public virtual Task<WmsAreaDto> UpdateAsync(Guid id, WmsAreaUpdateDto input)
- {
- return _wmsareaAppService.UpdateAsync(id, input);
- }
-
- /// <summary>
- /// 鍏嬮殕WmsArea.
- /// </summary>
- /// <param name="ids">Id闆嗗悎.</param>
- /// <returns></returns>
- //[Authorize]
- [HttpPost]
- [Route("Clone")]
- public virtual Task<List<WmsAreaDto>> CloneAsync([FromBody] IEnumerable<Guid> ids)
- {
- return _wmsareaAppService.CloneAsync(ids);
- }
-
- /// <summary>
- /// 鍒犻櫎wmsarea.
- /// </summary>
- /// <param name="id">鏍囪瘑绗�.</param>
- /// <returns></returns>
- //[Authorize]
- [HttpDelete]
- [Route("{id}")]
- public virtual Task DeleteAsync(Guid id)
- {
- return _wmsareaAppService.DeleteAsync(id);
- }
-
- /// <summary>
- /// 鎵归噺鍒犻櫎wmsarea.
- /// </summary>
- /// <param name="ids">The ids.</param>
- /// <returns></returns>
- //[Authorize]
- [HttpDelete]
- public virtual Task DeleteAsync([FromBody] IEnumerable<Guid> ids)
- {
- return _wmsareaAppService.DeleteManyAsync(ids);
- }
-
- /// <summary>
- /// 璋冩暣鎺掑簭.
- /// </summary>
- /// <param name="id">鏍囪瘑绗�.</param>
- /// <returns></returns>
- [HttpPut]
- [Route("{id}/AdjustSort/{sort}")]
- public virtual Task AdjustSortAsync(Guid id, int sort)
- {
- return _wmsareaAppService.AdjustSortAsync(id, sort);
- }
-
- /// <summary>
- /// 瀵煎叆wmsarea.
- /// </summary>
- /// <returns></returns>
- [Authorize]
- [HttpPost]
- [Route("Import")]
- public virtual async Task<IActionResult> ImportAsync(IFormFile file)
- {
- using var stream = new MemoryStream();
- await file.CopyToAsync(stream);
- stream.Seek(0L, SeekOrigin.Begin);
-
- var sheetNames = stream.GetSheetNames();
- var wmsareaRows = sheetNames.Contains("閰嶇疆") ? MiniExcel.Query<WmsAreasImportModel.WmsAreaImportModel>(stream, sheetName: "閰嶇疆").ToList() : new();
-
- if (!wmsareaRows.Any())
- {
- throw new UserFriendlyException("璇锋鏌ュ鍏ョ殑琛ㄦ牸");
- }
-
- await _wmsareaAppService.ImportAsync(new WmsAreasImportModel
- {
- WmsAreas = wmsareaRows,
- });
-
- return Ok();
- }
-
- /// <summary>
- /// 瀵煎嚭wmsarea.
- /// </summary>
- /// <returns></returns>
- [HttpGet]
- [Route("Export")]
- public virtual async Task<IActionResult> ExportAsync([FromQuery] GetWmsAreasInput input)
- {
- input.MaxResultCount = int.MaxValue;
- var exportData = await _wmsareaAppService.ExportAsync(input);
- var templatePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, $"Resources/Templates/WmsArea瀵煎嚭妯℃澘.xlsx");
- if (!System.IO.File.Exists(templatePath))
- {
- templatePath = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) ?? string.Empty, $"Resources/Templates/WmsArea瀵煎嚭妯℃澘.xlsx");
- }
-
- var memoryStream = new MemoryStream();
- await memoryStream.SaveAsByTemplateAsync(templatePath, exportData.Sheets);
- memoryStream.Seek(0L, SeekOrigin.Begin);
- return new FileStreamResult(memoryStream, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet") { FileDownloadName = $"{exportData.FileName}_{DateTime.Now:yyyyMMddhhmmss}.xlsx" };
- }
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/Controller/WmsContainerController.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/Controller/WmsContainerController.cs"
deleted file mode 100644
index 1780529..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/Controller/WmsContainerController.cs"
+++ /dev/null
@@ -1,187 +0,0 @@
-using Ao.Lang;
-using CMS.Extensions.Abp.AspNetCore.Mvc.Filters;
-using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsContainers;
-using CMS.Plugin.HIAWms.Application.Contracts.Services;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using MiniExcelLibs;
-using System.Reflection;
-using Volo.Abp;
-using Volo.Abp.Application.Dtos;
-
-namespace CMS.Plugin.HIAWms.Controller
-{
- /// <summary>
- /// WmsContainer鏈嶅姟
- /// </summary>
- [ApiController]
- [TypeFilter(typeof(CMSLanguageFilter))]
- [TypeFilter(typeof(CMSUowActionFilter))]
- [TypeFilter(typeof(CMSAuditActionFilter))]
- [TypeFilter(typeof(CMSExceptionFilter))]
- [Route("api/v{version:apiVersion}/HIAWms/[controller]")]
- public class WmsContainerController : ControllerBase
- {
- private readonly IWmsContainerAppService _wmscontainerAppService;
-
- /// <summary>
- /// Initializes a new instance of the <see cref="WmsContainerController"/> class.
- /// </summary>
- /// <param name="wmscontainerAppService">The wmscontainer application service.</param>
- public WmsContainerController(IWmsContainerAppService wmscontainerAppService)
- {
- _wmscontainerAppService = wmscontainerAppService;
- }
-
- /// <summary>
- /// 鑾峰彇wmscontainer.
- /// </summary>
- /// <param name="id">鏍囪瘑绗�.</param>
- /// <returns></returns>
- [HttpGet]
- [Route("{id}")]
- public virtual Task<WmsContainerDto> GetAsync(Guid id)
- {
- return _wmscontainerAppService.GetAsync(id);
- }
-
- /// <summary>
- /// 鑾峰彇wmscontainer鐨勫垪琛�.
- /// </summary>
- /// <param name="input">杈撳叆.</param>
- /// <returns></returns>
- [HttpGet]
- public virtual Task<PagedResultDto<WmsContainerDto>> GetListAsync([FromQuery] GetWmsContainersInput input)
- {
- return _wmscontainerAppService.GetListAsync(input);
- }
-
- /// <summary>
- /// 鍒涘缓wmscontainer.
- /// </summary>
- /// <param name="input">杈撳叆.</param>
- /// <returns></returns>
- //[Authorize]
- [HttpPost]
- public virtual Task<WmsContainerDto> CreateAsync(WmsContainerCreateDto input)
- {
- return _wmscontainerAppService.CreateAsync(input);
- }
-
- /// <summary>
- /// 鏇存柊wmscontainer.
- /// </summary>
- /// <param name="id">鏍囪瘑绗�.</param>
- /// <param name="input">杈撳叆.</param>
- /// <returns></returns>
- //[Authorize]
- [HttpPut]
- [Route("{id}")]
- public virtual Task<WmsContainerDto> UpdateAsync(Guid id, WmsContainerUpdateDto input)
- {
- return _wmscontainerAppService.UpdateAsync(id, input);
- }
-
- /// <summary>
- /// 鍏嬮殕WmsContainer.
- /// </summary>
- /// <param name="ids">Id闆嗗悎.</param>
- /// <returns></returns>
- //[Authorize]
- [HttpPost]
- [Route("Clone")]
- public virtual Task<List<WmsContainerDto>> CloneAsync([FromBody] IEnumerable<Guid> ids)
- {
- return _wmscontainerAppService.CloneAsync(ids);
- }
-
- /// <summary>
- /// 鍒犻櫎wmscontainer.
- /// </summary>
- /// <param name="id">鏍囪瘑绗�.</param>
- /// <returns></returns>
- //[Authorize]
- [HttpDelete]
- [Route("{id}")]
- public virtual Task DeleteAsync(Guid id)
- {
- return _wmscontainerAppService.DeleteAsync(id);
- }
-
- /// <summary>
- /// 鎵归噺鍒犻櫎wmscontainer.
- /// </summary>
- /// <param name="ids">The ids.</param>
- /// <returns></returns>
- //[Authorize]
- [HttpDelete]
- public virtual Task DeleteAsync([FromBody] IEnumerable<Guid> ids)
- {
- return _wmscontainerAppService.DeleteManyAsync(ids);
- }
-
- /// <summary>
- /// 璋冩暣鎺掑簭.
- /// </summary>
- /// <param name="id">鏍囪瘑绗�.</param>
- /// <returns></returns>
- [HttpPut]
- [Route("{id}/AdjustSort/{sort}")]
- public virtual Task AdjustSortAsync(Guid id, int sort)
- {
- return _wmscontainerAppService.AdjustSortAsync(id, sort);
- }
-
- /// <summary>
- /// 瀵煎叆wmscontainer.
- /// </summary>
- /// <returns></returns>
- [Authorize]
- [HttpPost]
- [Route("Import")]
- public virtual async Task<IActionResult> ImportAsync(IFormFile file)
- {
- using var stream = new MemoryStream();
- await file.CopyToAsync(stream);
- stream.Seek(0L, SeekOrigin.Begin);
-
- var sheetNames = stream.GetSheetNames();
- var wmscontainerRows = sheetNames.Contains("閰嶇疆") ? MiniExcel.Query<WmsContainersImportModel.WmsContainerImportModel>(stream, sheetName: "閰嶇疆").ToList() : new();
-
- if (!wmscontainerRows.Any())
- {
- throw new UserFriendlyException("璇锋鏌ュ鍏ョ殑琛ㄦ牸");
- }
-
- await _wmscontainerAppService.ImportAsync(new WmsContainersImportModel
- {
- WmsContainers = wmscontainerRows,
- });
-
- return Ok();
- }
-
- /// <summary>
- /// 瀵煎嚭wmscontainer.
- /// </summary>
- /// <returns></returns>
- [HttpGet]
- [Route("Export")]
- public virtual async Task<IActionResult> ExportAsync([FromQuery] GetWmsContainersInput input)
- {
- input.MaxResultCount = int.MaxValue;
- var exportData = await _wmscontainerAppService.ExportAsync(input);
- var templatePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, $"Resources/Templates/WmsContainer瀵煎嚭妯℃澘.xlsx");
- if (!System.IO.File.Exists(templatePath))
- {
- templatePath = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) ?? string.Empty, $"Resources/Templates/WmsContainer瀵煎嚭妯℃澘.xlsx");
- }
-
- var memoryStream = new MemoryStream();
- await memoryStream.SaveAsByTemplateAsync(templatePath, exportData.Sheets);
- memoryStream.Seek(0L, SeekOrigin.Begin);
- return new FileStreamResult(memoryStream, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet") { FileDownloadName = $"{exportData.FileName}_{DateTime.Now:yyyyMMddhhmmss}.xlsx" };
- }
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/Controller/WmsEnumController.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/Controller/WmsEnumController.cs"
deleted file mode 100644
index 021aa9d..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/Controller/WmsEnumController.cs"
+++ /dev/null
@@ -1,69 +0,0 @@
-锘縰sing CMS.Extensions.Abp.AspNetCore.Mvc.Filters;
-using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsEnumDto;
-using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStores;
-using CMS.Plugin.HIAWms.Application.Contracts.Services;
-using CMS.Plugin.HIAWms.Domain.Shared.Util;
-using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Web;
-using static CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsAreas.WmsAreaCreateOrUpdateDtoBase;
-
-namespace CMS.Plugin.HIAWms.Controller
-{
- /// <summary>
- /// 鏋氫妇鏈嶅姟鎺ュ彛.
- /// </summary>
- [ApiController]
- [TypeFilter(typeof(CMSLanguageFilter))]
- [TypeFilter(typeof(CMSUowActionFilter))]
- [TypeFilter(typeof(CMSAuditActionFilter))]
- [TypeFilter(typeof(CMSExceptionFilter))]
- [Route("api/v{version:apiVersion}/HIAWms/[controller]")]
- public class WmsEnumController : ControllerBase
- {
- private readonly IWmsEnumAppService _wmsEnumAppService;
-
- /// <summary>
- /// Initializes a new instance of the <see cref="WmsEnumController"/> class.
- /// 鏋勯�犲嚱鏁�.
- /// </summary>
- /// <param name="wmsEnumAppService"></param>
- public WmsEnumController(IWmsEnumAppService wmsEnumAppService)
- {
- _wmsEnumAppService = wmsEnumAppService;
- }
-
- /// <summary>
- /// 鑾峰彇鏋氫妇鏁版嵁.
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpPost]
- public List<EnumItem> GetEnumDataList(WmsEnumInput input)
- {
- return _wmsEnumAppService.GetEnumDataList(input);
- }
-
- /// <summary>
- /// 鑾峰彇浠撳簱鍒楄〃
- /// </summary>
- /// <returns></returns>
- [HttpGet]
- [Route("StoreList")]
- public async Task<List<WmsStoreForAreaOutpur>> GetStreList()
- {
- return await _wmsEnumAppService.GetStreList();
- }
-
- /// <summary>
- /// 搴撳尯鍒楄〃
- /// </summary>
- /// <returns></returns>
- [HttpGet]
- [Route("AreaList")]
- public async Task<List<AreaForListOuptut>> GetAreaListAsync()
- {
- return await _wmsEnumAppService.GetAreaListAsync();
- }
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/Controller/WmsInOutStockRecordController.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/Controller/WmsInOutStockRecordController.cs"
deleted file mode 100644
index 425b7ae..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/Controller/WmsInOutStockRecordController.cs"
+++ /dev/null
@@ -1,188 +0,0 @@
-using Ao.Lang;
-using CMS.Extensions.Abp.AspNetCore.Mvc.Filters;
-using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsInOutStockRecord;
-using CMS.Plugin.HIAWms.Application.Contracts.Services;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using MiniExcelLibs;
-using System.Reflection;
-using Volo.Abp;
-using Volo.Abp.Application.Dtos;
-
-namespace CMS.Plugin.HIAWms.Controller
-{
- /// <summary>
- /// 鍑哄叆搴撹褰曡〃鏈嶅姟
- /// </summary>
- [ApiController]
- [TypeFilter(typeof(CMSLanguageFilter))]
- [TypeFilter(typeof(CMSUowActionFilter))]
- [TypeFilter(typeof(CMSAuditActionFilter))]
- [TypeFilter(typeof(CMSExceptionFilter))]
- [Route("api/v{version:apiVersion}/HIAWms/[controller]")]
- public class WmsInOutStockRecordController : ControllerBase
- {
- private readonly IWmsInOutStockRecordAppService _wmsInOutStockRecordAppService;
-
- /// <summary>
- /// Initializes a new instance of the <see cref="WmsInOutStockRecordController"/> class.
- /// </summary>
- /// <param name="wmsInOutStockRecordAppService">The wmsInOutStockRecord application service.</param>
- public WmsInOutStockRecordController(IWmsInOutStockRecordAppService wmsInOutStockRecordAppService)
- {
- _wmsInOutStockRecordAppService = wmsInOutStockRecordAppService;
- }
-
- /// <summary>
- /// 鑾峰彇鍑哄叆搴撹褰曡〃
- /// </summary>
- /// <param name="id">鏍囪瘑绗�.</param>
- /// <returns></returns>
- [HttpGet]
- [Route("{id}")]
- public virtual Task<WmsInOutStockRecordDto> GetAsync(Guid id)
- {
- return _wmsInOutStockRecordAppService.GetAsync(id);
- }
-
- /// <summary>
- /// 鍒嗛〉鑾峰彇鍑哄叆搴撹褰曡〃鐨勫垪琛�.
- /// </summary>
- /// <param name="input">杈撳叆.</param>
- /// <returns></returns>
- [HttpGet]
- [Route("Page")]
- public virtual Task<PagedResultDto<WmsInOutStockRecordDto>> GetListAsync([FromQuery] GetWmsInOutStockRecordInput input)
- {
- return _wmsInOutStockRecordAppService.GetListAsync(input);
- }
-
- /// <summary>
- /// 鍒涘缓鍑哄叆搴撹褰曡〃
- /// </summary>
- /// <param name="input">杈撳叆.</param>
- /// <returns></returns>
- //[Authorize]
- [HttpPost]
- public virtual Task<WmsInOutStockRecordDto> CreateAsync(WmsInOutStockRecordCreateDto input)
- {
- return _wmsInOutStockRecordAppService.CreateAsync(input);
- }
-
- /// <summary>
- /// 鏇存柊鍑哄叆搴撹褰曡〃
- /// </summary>
- /// <param name="id">鏍囪瘑绗�.</param>
- /// <param name="input">杈撳叆.</param>
- /// <returns></returns>
- //[Authorize]
- [HttpPut]
- [Route("{id}")]
- public virtual Task<WmsInOutStockRecordDto> UpdateAsync(Guid id, WmsInOutStockRecordUpdateDto input)
- {
- return _wmsInOutStockRecordAppService.UpdateAsync(id, input);
- }
-
- /// <summary>
- /// 鍏嬮殕鍑哄叆搴撹褰曡〃
- /// </summary>
- /// <param name="ids">Id闆嗗悎.</param>
- /// <returns></returns>
- //[Authorize]
- [HttpPost]
- [Route("Clone")]
- public virtual Task<List<WmsInOutStockRecordDto>> CloneAsync([FromBody] IEnumerable<Guid> ids)
- {
- return _wmsInOutStockRecordAppService.CloneAsync(ids);
- }
-
- /// <summary>
- /// 鍒犻櫎鍑哄叆搴撹褰曡〃
- /// </summary>
- /// <param name="id">鏍囪瘑绗�.</param>
- /// <returns></returns>
- //[Authorize]
- [HttpDelete]
- [Route("{id}")]
- public virtual Task DeleteAsync(Guid id)
- {
- return _wmsInOutStockRecordAppService.DeleteAsync(id);
- }
-
- /// <summary>
- /// 鎵归噺鍒犻櫎鍑哄叆搴撹褰曡〃
- /// </summary>
- /// <param name="ids">The ids.</param>
- /// <returns></returns>
- //[Authorize]
- [HttpDelete]
- public virtual Task DeleteAsync([FromBody] IEnumerable<Guid> ids)
- {
- return _wmsInOutStockRecordAppService.DeleteManyAsync(ids);
- }
-
- /// <summary>
- /// 璋冩暣鎺掑簭鍑哄叆搴撹褰曡〃
- /// </summary>
- /// <param name="id">鏍囪瘑绗�.</param>
- /// <returns></returns>
- [HttpPut]
- [Route("{id}/AdjustSort/{sort}")]
- public virtual Task AdjustSortAsync(Guid id, int sort)
- {
- return _wmsInOutStockRecordAppService.AdjustSortAsync(id, sort);
- }
-
- /// <summary>
- /// 瀵煎叆鍑哄叆搴撹褰曡〃
- /// </summary>
- /// <returns></returns>
- [Authorize]
- [HttpPost]
- [Route("Import")]
- public virtual async Task<IActionResult> ImportAsync(IFormFile file)
- {
- using var stream = new MemoryStream();
- await file.CopyToAsync(stream);
- stream.Seek(0L, SeekOrigin.Begin);
-
- var sheetNames = stream.GetSheetNames();
- var wmsInOutStockRecordRows = sheetNames.Contains("閰嶇疆") ? MiniExcel.Query<WmsInOutStockRecordsImportModel.WmsInOutStockRecordImportModel>(stream, sheetName: "閰嶇疆").ToList() : new();
-
- if (!wmsInOutStockRecordRows.Any())
- {
- throw new UserFriendlyException("璇锋鏌ュ鍏ョ殑琛ㄦ牸");
- }
-
- await _wmsInOutStockRecordAppService.ImportAsync(new WmsInOutStockRecordsImportModel
- {
- WmsInOutStockRecords = wmsInOutStockRecordRows,
- });
-
- return Ok();
- }
-
- /// <summary>
- /// 瀵煎嚭鍑哄叆搴撹褰曡〃
- /// </summary>
- /// <returns></returns>
- [HttpGet]
- [Route("Export")]
- public virtual async Task<IActionResult> ExportAsync([FromQuery] GetWmsInOutStockRecordInput input)
- {
- input.MaxResultCount = int.MaxValue;
- var exportData = await _wmsInOutStockRecordAppService.ExportAsync(input);
- var templatePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, $"Resources/Templates/WmsInOutStockRecord瀵煎嚭妯℃澘.xlsx");
- if (!System.IO.File.Exists(templatePath))
- {
- templatePath = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) ?? string.Empty, $"Resources/Templates/WmsInOutStockRecord瀵煎嚭妯℃澘.xlsx");
- }
-
- var memoryStream = new MemoryStream();
- await memoryStream.SaveAsByTemplateAsync(templatePath, exportData.Sheets);
- memoryStream.Seek(0L, SeekOrigin.Begin);
- return new FileStreamResult(memoryStream, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet") { FileDownloadName = $"{exportData.FileName}_{DateTime.Now:yyyyMMddhhmmss}.xlsx" };
- }
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/Controller/WmsMaterialController.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/Controller/WmsMaterialController.cs"
deleted file mode 100644
index 9060e10..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/Controller/WmsMaterialController.cs"
+++ /dev/null
@@ -1,188 +0,0 @@
-using Ao.Lang;
-using CMS.Extensions.Abp.AspNetCore.Mvc.Filters;
-using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterial;
-using CMS.Plugin.HIAWms.Application.Contracts.Services;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using MiniExcelLibs;
-using System.Reflection;
-using Volo.Abp;
-using Volo.Abp.Application.Dtos;
-
-namespace CMS.Plugin.HIAWms.Controller
-{
- /// <summary>
- /// 鐗╂枡鍩虹淇℃伅琛ㄦ湇鍔�
- /// </summary>
- [ApiController]
- [TypeFilter(typeof(CMSLanguageFilter))]
- [TypeFilter(typeof(CMSUowActionFilter))]
- [TypeFilter(typeof(CMSAuditActionFilter))]
- [TypeFilter(typeof(CMSExceptionFilter))]
- [Route("api/v{version:apiVersion}/HIAWms/[controller]")]
- public class WmsMaterialController : ControllerBase
- {
- private readonly IWmsMaterialAppService _wmsmaterialsAppService;
-
- /// <summary>
- /// Initializes a new instance of the <see cref="WmsMaterialController"/> class.
- /// </summary>
- /// <param name="wmsmaterialsAppService">The wmsmaterials application service.</param>
- public WmsMaterialController(IWmsMaterialAppService wmsmaterialsAppService)
- {
- _wmsmaterialsAppService = wmsmaterialsAppService;
- }
-
- /// <summary>
- /// 鑾峰彇鐗╂枡鍩虹淇℃伅琛�
- /// </summary>
- /// <param name="id">鏍囪瘑绗�.</param>
- /// <returns></returns>
- [HttpGet]
- [Route("{id}")]
- public virtual Task<WmsMaterialDto> GetAsync(Guid id)
- {
- return _wmsmaterialsAppService.GetAsync(id);
- }
-
- /// <summary>
- /// 鍒嗛〉鑾峰彇鐗╂枡鍩虹淇℃伅琛ㄧ殑鍒楄〃.
- /// </summary>
- /// <param name="input">杈撳叆.</param>
- /// <returns></returns>
- [HttpGet]
- [Route("Page")]
- public virtual Task<PagedResultDto<WmsMaterialDto>> GetListAsync([FromQuery] GetWmsMaterialInput input)
- {
- return _wmsmaterialsAppService.GetListAsync(input);
- }
-
- /// <summary>
- /// 鍒涘缓鐗╂枡鍩虹淇℃伅琛�
- /// </summary>
- /// <param name="input">杈撳叆.</param>
- /// <returns></returns>
- //[Authorize]
- [HttpPost]
- public virtual Task<WmsMaterialDto> CreateAsync(WmsMaterialCreateDto input)
- {
- return _wmsmaterialsAppService.CreateAsync(input);
- }
-
- /// <summary>
- /// 鏇存柊鐗╂枡鍩虹淇℃伅琛�
- /// </summary>
- /// <param name="id">鏍囪瘑绗�.</param>
- /// <param name="input">杈撳叆.</param>
- /// <returns></returns>
- //[Authorize]
- [HttpPut]
- [Route("{id}")]
- public virtual Task<WmsMaterialDto> UpdateAsync(Guid id, WmsMaterialUpdateDto input)
- {
- return _wmsmaterialsAppService.UpdateAsync(id, input);
- }
-
- /// <summary>
- /// 鍏嬮殕鐗╂枡鍩虹淇℃伅琛�
- /// </summary>
- /// <param name="ids">Id闆嗗悎.</param>
- /// <returns></returns>
- //[Authorize]
- [HttpPost]
- [Route("Clone")]
- public virtual Task<List<WmsMaterialDto>> CloneAsync([FromBody] IEnumerable<Guid> ids)
- {
- return _wmsmaterialsAppService.CloneAsync(ids);
- }
-
- /// <summary>
- /// 鍒犻櫎鐗╂枡鍩虹淇℃伅琛�
- /// </summary>
- /// <param name="id">鏍囪瘑绗�.</param>
- /// <returns></returns>
- //[Authorize]
- [HttpDelete]
- [Route("{id}")]
- public virtual Task DeleteAsync(Guid id)
- {
- return _wmsmaterialsAppService.DeleteAsync(id);
- }
-
- /// <summary>
- /// 鎵归噺鍒犻櫎鐗╂枡鍩虹淇℃伅琛�
- /// </summary>
- /// <param name="ids">The ids.</param>
- /// <returns></returns>
- //[Authorize]
- [HttpDelete]
- public virtual Task DeleteAsync([FromBody] IEnumerable<Guid> ids)
- {
- return _wmsmaterialsAppService.DeleteManyAsync(ids);
- }
-
- /// <summary>
- /// 璋冩暣鎺掑簭鐗╂枡鍩虹淇℃伅琛�
- /// </summary>
- /// <param name="id">鏍囪瘑绗�.</param>
- /// <returns></returns>
- [HttpPut]
- [Route("{id}/AdjustSort/{sort}")]
- public virtual Task AdjustSortAsync(Guid id, int sort)
- {
- return _wmsmaterialsAppService.AdjustSortAsync(id, sort);
- }
-
- /// <summary>
- /// 瀵煎叆鐗╂枡鍩虹淇℃伅琛�
- /// </summary>
- /// <returns></returns>
- [Authorize]
- [HttpPost]
- [Route("Import")]
- public virtual async Task<IActionResult> ImportAsync(IFormFile file)
- {
- using var stream = new MemoryStream();
- await file.CopyToAsync(stream);
- stream.Seek(0L, SeekOrigin.Begin);
-
- var sheetNames = stream.GetSheetNames();
- var wmsmaterialsRows = sheetNames.Contains("閰嶇疆") ? MiniExcel.Query<WmsMaterialsImportModel.WmsMaterialImportModel>(stream, sheetName: "閰嶇疆").ToList() : new();
-
- if (!wmsmaterialsRows.Any())
- {
- throw new UserFriendlyException("璇锋鏌ュ鍏ョ殑琛ㄦ牸");
- }
-
- await _wmsmaterialsAppService.ImportAsync(new WmsMaterialsImportModel
- {
- WmsMaterials = wmsmaterialsRows,
- });
-
- return Ok();
- }
-
- /// <summary>
- /// 瀵煎嚭鐗╂枡鍩虹淇℃伅琛�
- /// </summary>
- /// <returns></returns>
- [HttpGet]
- [Route("Export")]
- public virtual async Task<IActionResult> ExportAsync([FromQuery] GetWmsMaterialInput input)
- {
- input.MaxResultCount = int.MaxValue;
- var exportData = await _wmsmaterialsAppService.ExportAsync(input);
- var templatePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, $"Resources/Templates/WmsMaterial瀵煎嚭妯℃澘.xlsx");
- if (!System.IO.File.Exists(templatePath))
- {
- templatePath = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) ?? string.Empty, $"Resources/Templates/WmsMaterial瀵煎嚭妯℃澘.xlsx");
- }
-
- var memoryStream = new MemoryStream();
- await memoryStream.SaveAsByTemplateAsync(templatePath, exportData.Sheets);
- memoryStream.Seek(0L, SeekOrigin.Begin);
- return new FileStreamResult(memoryStream, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet") { FileDownloadName = $"{exportData.FileName}_{DateTime.Now:yyyyMMddhhmmss}.xlsx" };
- }
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/Controller/WmsPlaceController.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/Controller/WmsPlaceController.cs"
deleted file mode 100644
index 07c65ab..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/Controller/WmsPlaceController.cs"
+++ /dev/null
@@ -1,187 +0,0 @@
-using Ao.Lang;
-using CMS.Extensions.Abp.AspNetCore.Mvc.Filters;
-using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlaces;
-using CMS.Plugin.HIAWms.Application.Contracts.Services;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using MiniExcelLibs;
-using System.Reflection;
-using Volo.Abp;
-using Volo.Abp.Application.Dtos;
-
-namespace CMS.Plugin.HIAWms.Controller
-{
- /// <summary>
- /// WmsPlace鏈嶅姟
- /// </summary>
- [ApiController]
- [TypeFilter(typeof(CMSLanguageFilter))]
- [TypeFilter(typeof(CMSUowActionFilter))]
- [TypeFilter(typeof(CMSAuditActionFilter))]
- [TypeFilter(typeof(CMSExceptionFilter))]
- [Route("api/v{version:apiVersion}/HIAWms/[controller]")]
- public class WmsPlaceController : ControllerBase
- {
- private readonly IWmsPlaceAppService _wmsplaceAppService;
-
- /// <summary>
- /// Initializes a new instance of the <see cref="WmsPlaceController"/> class.
- /// </summary>
- /// <param name="wmsplaceAppService">The wmsplace application service.</param>
- public WmsPlaceController(IWmsPlaceAppService wmsplaceAppService)
- {
- _wmsplaceAppService = wmsplaceAppService;
- }
-
- /// <summary>
- /// 鑾峰彇wmsplace.
- /// </summary>
- /// <param name="id">鏍囪瘑绗�.</param>
- /// <returns></returns>
- [HttpGet]
- [Route("{id}")]
- public virtual Task<WmsPlaceDto> GetAsync(Guid id)
- {
- return _wmsplaceAppService.GetAsync(id);
- }
-
- /// <summary>
- /// 鑾峰彇wmsplace鐨勫垪琛�.
- /// </summary>
- /// <param name="input">杈撳叆.</param>
- /// <returns></returns>
- [HttpGet]
- public virtual Task<PagedResultDto<WmsPlaceDto>> GetListAsync([FromQuery] GetWmsPlacesInput input)
- {
- return _wmsplaceAppService.GetListAsync(input);
- }
-
- /// <summary>
- /// 鍒涘缓wmsplace.
- /// </summary>
- /// <param name="input">杈撳叆.</param>
- /// <returns></returns>
- //[Authorize]
- [HttpPost]
- public virtual Task<WmsPlaceDto> CreateAsync(WmsPlaceCreateDto input)
- {
- return _wmsplaceAppService.CreateAsync(input);
- }
-
- /// <summary>
- /// 鏇存柊wmsplace.
- /// </summary>
- /// <param name="id">鏍囪瘑绗�.</param>
- /// <param name="input">杈撳叆.</param>
- /// <returns></returns>
- //[Authorize]
- [HttpPut]
- [Route("{id}")]
- public virtual Task<WmsPlaceDto> UpdateAsync(Guid id, WmsPlaceUpdateDto input)
- {
- return _wmsplaceAppService.UpdateAsync(id, input);
- }
-
- /// <summary>
- /// 鍏嬮殕WmsPlace.
- /// </summary>
- /// <param name="ids">Id闆嗗悎.</param>
- /// <returns></returns>
- //[Authorize]
- [HttpPost]
- [Route("Clone")]
- public virtual Task<List<WmsPlaceDto>> CloneAsync([FromBody] IEnumerable<Guid> ids)
- {
- return _wmsplaceAppService.CloneAsync(ids);
- }
-
- /// <summary>
- /// 鍒犻櫎wmsplace.
- /// </summary>
- /// <param name="id">鏍囪瘑绗�.</param>
- /// <returns></returns>
- //[Authorize]
- [HttpDelete]
- [Route("{id}")]
- public virtual Task DeleteAsync(Guid id)
- {
- return _wmsplaceAppService.DeleteAsync(id);
- }
-
- /// <summary>
- /// 鎵归噺鍒犻櫎wmsplace.
- /// </summary>
- /// <param name="ids">The ids.</param>
- /// <returns></returns>
- //[Authorize]
- [HttpDelete]
- public virtual Task DeleteAsync([FromBody] IEnumerable<Guid> ids)
- {
- return _wmsplaceAppService.DeleteManyAsync(ids);
- }
-
- /// <summary>
- /// 璋冩暣鎺掑簭.
- /// </summary>
- /// <param name="id">鏍囪瘑绗�.</param>
- /// <returns></returns>
- [HttpPut]
- [Route("{id}/AdjustSort/{sort}")]
- public virtual Task AdjustSortAsync(Guid id, int sort)
- {
- return _wmsplaceAppService.AdjustSortAsync(id, sort);
- }
-
- /// <summary>
- /// 瀵煎叆wmsplace.
- /// </summary>
- /// <returns></returns>
- [Authorize]
- [HttpPost]
- [Route("Import")]
- public virtual async Task<IActionResult> ImportAsync(IFormFile file)
- {
- using var stream = new MemoryStream();
- await file.CopyToAsync(stream);
- stream.Seek(0L, SeekOrigin.Begin);
-
- var sheetNames = stream.GetSheetNames();
- var wmsplaceRows = sheetNames.Contains("閰嶇疆") ? MiniExcel.Query<WmsPlacesImportModel.WmsPlaceImportModel>(stream, sheetName: "閰嶇疆").ToList() : new();
-
- if (!wmsplaceRows.Any())
- {
- throw new UserFriendlyException("璇锋鏌ュ鍏ョ殑琛ㄦ牸");
- }
-
- await _wmsplaceAppService.ImportAsync(new WmsPlacesImportModel
- {
- WmsPlaces = wmsplaceRows,
- });
-
- return Ok();
- }
-
- /// <summary>
- /// 瀵煎嚭wmsplace.
- /// </summary>
- /// <returns></returns>
- [HttpGet]
- [Route("Export")]
- public virtual async Task<IActionResult> ExportAsync([FromQuery] GetWmsPlacesInput input)
- {
- input.MaxResultCount = int.MaxValue;
- var exportData = await _wmsplaceAppService.ExportAsync(input);
- var templatePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, $"Resources/Templates/WmsPlace瀵煎嚭妯℃澘.xlsx");
- if (!System.IO.File.Exists(templatePath))
- {
- templatePath = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) ?? string.Empty, $"Resources/Templates/WmsPlace瀵煎嚭妯℃澘.xlsx");
- }
-
- var memoryStream = new MemoryStream();
- await memoryStream.SaveAsByTemplateAsync(templatePath, exportData.Sheets);
- memoryStream.Seek(0L, SeekOrigin.Begin);
- return new FileStreamResult(memoryStream, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet") { FileDownloadName = $"{exportData.FileName}_{DateTime.Now:yyyyMMddhhmmss}.xlsx" };
- }
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/Controller/WmsStoreController.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/Controller/WmsStoreController.cs"
deleted file mode 100644
index e3f25e0..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/Controller/WmsStoreController.cs"
+++ /dev/null
@@ -1,187 +0,0 @@
-using Ao.Lang;
-using CMS.Extensions.Abp.AspNetCore.Mvc.Filters;
-using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStores;
-using CMS.Plugin.HIAWms.Application.Contracts.Services;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using MiniExcelLibs;
-using System.Reflection;
-using Volo.Abp;
-using Volo.Abp.Application.Dtos;
-
-namespace CMS.Plugin.HIAWms.Controller
-{
- /// <summary>
- /// WmsStore鏈嶅姟
- /// </summary>
- [ApiController]
- [TypeFilter(typeof(CMSLanguageFilter))]
- [TypeFilter(typeof(CMSUowActionFilter))]
- [TypeFilter(typeof(CMSAuditActionFilter))]
- [TypeFilter(typeof(CMSExceptionFilter))]
- [Route("api/v{version:apiVersion}/HIAWms/[controller]")]
- public class WmsStoreController : ControllerBase
- {
- private readonly IWmsStoreAppService _wmsstoreAppService;
-
- /// <summary>
- /// Initializes a new instance of the <see cref="WmsStoreController"/> class.
- /// </summary>
- /// <param name="wmsstoreAppService">The wmsstore application service.</param>
- public WmsStoreController(IWmsStoreAppService wmsstoreAppService)
- {
- _wmsstoreAppService = wmsstoreAppService;
- }
-
- /// <summary>
- /// 鑾峰彇wmsstore.
- /// </summary>
- /// <param name="id">鏍囪瘑绗�.</param>
- /// <returns></returns>
- [HttpGet]
- [Route("{id}")]
- public virtual Task<WmsStoreDto> GetAsync(Guid id)
- {
- return _wmsstoreAppService.GetAsync(id);
- }
-
- /// <summary>
- /// 鑾峰彇wmsstore鐨勫垪琛�.
- /// </summary>
- /// <param name="input">杈撳叆.</param>
- /// <returns></returns>
- [HttpGet]
- public virtual Task<PagedResultDto<WmsStoreDto>> GetListAsync([FromQuery] GetWmsStoresInput input)
- {
- return _wmsstoreAppService.GetListAsync(input);
- }
-
- /// <summary>
- /// 鍒涘缓wmsstore.
- /// </summary>
- /// <param name="input">杈撳叆.</param>
- /// <returns></returns>
- //[Authorize]
- [HttpPost]
- public virtual Task<WmsStoreDto> CreateAsync(WmsStoreCreateDto input)
- {
- return _wmsstoreAppService.CreateAsync(input);
- }
-
- /// <summary>
- /// 鏇存柊wmsstore.
- /// </summary>
- /// <param name="id">鏍囪瘑绗�.</param>
- /// <param name="input">杈撳叆.</param>
- /// <returns></returns>
- //[Authorize]
- [HttpPut]
- [Route("{id}")]
- public virtual Task<WmsStoreDto> UpdateAsync(Guid id, WmsStoreUpdateDto input)
- {
- return _wmsstoreAppService.UpdateAsync(id, input);
- }
-
- /// <summary>
- /// 鍏嬮殕WmsStore.
- /// </summary>
- /// <param name="ids">Id闆嗗悎.</param>
- /// <returns></returns>
- //[Authorize]
- [HttpPost]
- [Route("Clone")]
- public virtual Task<List<WmsStoreDto>> CloneAsync([FromBody] IEnumerable<Guid> ids)
- {
- return _wmsstoreAppService.CloneAsync(ids);
- }
-
- /// <summary>
- /// 鍒犻櫎wmsstore.
- /// </summary>
- /// <param name="id">鏍囪瘑绗�.</param>
- /// <returns></returns>
- //[Authorize]
- [HttpDelete]
- [Route("{id}")]
- public virtual Task DeleteAsync(Guid id)
- {
- return _wmsstoreAppService.DeleteAsync(id);
- }
-
- /// <summary>
- /// 鎵归噺鍒犻櫎wmsstore.
- /// </summary>
- /// <param name="ids">The ids.</param>
- /// <returns></returns>
- //[Authorize]
- [HttpDelete]
- public virtual Task DeleteAsync([FromBody] IEnumerable<Guid> ids)
- {
- return _wmsstoreAppService.DeleteManyAsync(ids);
- }
-
- /// <summary>
- /// 璋冩暣鎺掑簭.
- /// </summary>
- /// <param name="id">鏍囪瘑绗�.</param>
- /// <returns></returns>
- [HttpPut]
- [Route("{id}/AdjustSort/{sort}")]
- public virtual Task AdjustSortAsync(Guid id, int sort)
- {
- return _wmsstoreAppService.AdjustSortAsync(id, sort);
- }
-
- /// <summary>
- /// 瀵煎叆wmsstore.
- /// </summary>
- /// <returns></returns>
- [Authorize]
- [HttpPost]
- [Route("Import")]
- public virtual async Task<IActionResult> ImportAsync(IFormFile file)
- {
- using var stream = new MemoryStream();
- await file.CopyToAsync(stream);
- stream.Seek(0L, SeekOrigin.Begin);
-
- var sheetNames = stream.GetSheetNames();
- var wmsstoreRows = sheetNames.Contains("閰嶇疆") ? MiniExcel.Query<WmsStoresImportModel.WmsStoreImportModel>(stream, sheetName: "閰嶇疆").ToList() : new();
-
- if (!wmsstoreRows.Any())
- {
- throw new UserFriendlyException("璇锋鏌ュ鍏ョ殑琛ㄦ牸");
- }
-
- await _wmsstoreAppService.ImportAsync(new WmsStoresImportModel
- {
- WmsStores = wmsstoreRows,
- });
-
- return Ok();
- }
-
- /// <summary>
- /// 瀵煎嚭wmsstore.
- /// </summary>
- /// <returns></returns>
- [HttpGet]
- [Route("Export")]
- public virtual async Task<IActionResult> ExportAsync([FromQuery] GetWmsStoresInput input)
- {
- input.MaxResultCount = int.MaxValue;
- var exportData = await _wmsstoreAppService.ExportAsync(input);
- var templatePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, $"Resources/Templates/WmsStore瀵煎嚭妯℃澘.xlsx");
- if (!System.IO.File.Exists(templatePath))
- {
- templatePath = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) ?? string.Empty, $"Resources/Templates/WmsStore瀵煎嚭妯℃澘.xlsx");
- }
-
- var memoryStream = new MemoryStream();
- await memoryStream.SaveAsByTemplateAsync(templatePath, exportData.Sheets);
- memoryStream.Seek(0L, SeekOrigin.Begin);
- return new FileStreamResult(memoryStream, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet") { FileDownloadName = $"{exportData.FileName}_{DateTime.Now:yyyyMMddhhmmss}.xlsx" };
- }
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/EventHandlers/HIAWmsEventHandler.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/EventHandlers/HIAWmsEventHandler.cs"
deleted file mode 100644
index d5c8f45..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/EventHandlers/HIAWmsEventHandler.cs"
+++ /dev/null
@@ -1,80 +0,0 @@
-using CMS.Plugin.MesSuite.Abstractions.Events;
-using CMS.Plugin.MesSuite.Abstractions.Models;
-using CMS.Plugin.HIAWms.Domain.WmsContainers;
-using CMS.Plugin.OrderManagement.Abstractions.Models;
-using CMS.Plugin.ProcessManagement.Abstractions.Models;
-using CMS.Plugin.TraceManagement.Abstractions.Models.Traces;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using Volo.Abp.DependencyInjection;
-using Volo.Abp.EventBus.Distributed;
-using Volo.Abp.Uow;
-
-namespace CMS.Plugin.HIAWms.EventHandlers
-{
- /// <summary>
- /// 娴佺▼浜嬩欢澶勭悊绋嬪簭
- /// </summary>
- public class HIAWmsEventHandler : IDistributedEventHandler<ProcessFlowEto>, ITransientDependency
- {
- private readonly ILogger _logger;
- private readonly IServiceProvider _serviceProvider;
-
- /// <summary>
- /// Initializes a new instance of the <see cref="HIAWmsEventHandler"/> class.
- /// </summary>
- /// <param name="logger">The logger.</param>
- /// <param name="serviceProvider">The service provider.</param>
- public HIAWmsEventHandler(ILogger<HIAWmsEventHandler> logger, IServiceProvider serviceProvider)
- {
- this._logger = logger;
- this._serviceProvider = serviceProvider;
- }
-
- /// <summary>
- /// Handler handles the event by implementing this method.
- /// </summary>
- /// <param name="eventData">Event data</param>
- public async Task HandleEventAsync(ProcessFlowEto eventData)
- {
- if (eventData.Activity.Equals("姝ラ鍚嶇О"))
- {
- _logger.LogInformation($"WmsContainerEventHandler: Activity={eventData.Activity}");
-
- var serialNumber = eventData?.FlowItems[FlowItemCollection.SerialNumber]?.ToString();
-
- // 宸ヨ壓妯″瀷
- var process = eventData?.FlowItems[FlowItemCollection.ApplicationData] as ProcessModel;
-
- // 浜у搧妯″瀷
- var product = eventData?.FlowItems[FlowItemCollection.ProductModel] as AssociationProductModel;
-
- // 杩芥函妯″瀷
- var trace = eventData?.FlowItems[FlowItemCollection.TraceModel] as TraceModel;
-
- // 宸ュ崟妯″瀷
- var order = eventData?.FlowItems[FlowItemCollection.OrderModel] as OrderModel;
-
- // 涓氬姟澶勭悊
- await ProcessAsync();
- }
- }
-
- /// <summary>
- /// Processes the asynchronous.
- /// </summary>
- private async Task ProcessAsync()
- {
- using var scope = _serviceProvider.CreateScope();
- var unitOfWorkManager = scope.ServiceProvider.GetRequiredService<IUnitOfWorkManager>();
- using var uow = unitOfWorkManager.Begin(requiresNew: true);
- var wmscontainerRepository = scope.ServiceProvider.GetRequiredService<IWmsContainerRepository>();
- var count = await wmscontainerRepository.GetCountAsync();
-
- // 濡傛灉鏈夋洿鏂版暟鎹簱鎿嶄綔锛岄渶鎻愪氦淇濆瓨
- // await uow.SaveChangesAsync();
-
- _logger.LogInformation($"ProcessAsync锛孋ount={count}");
- }
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/FlowProcessors/HIAWmsFlowProcessor.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/FlowProcessors/HIAWmsFlowProcessor.cs"
deleted file mode 100644
index 8d1b2af..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/FlowProcessors/HIAWmsFlowProcessor.cs"
+++ /dev/null
@@ -1,91 +0,0 @@
-using CMS.Plugin.FlowManagement.Abstractions;
-using CMS.Plugin.FlowManagement.Abstractions.Models;
-using CMS.Plugin.MesSuite.Abstractions.Models;
-using CMS.Plugin.HIAWms.Domain.WmsContainers;
-using CMS.Plugin.OrderManagement.Abstractions.Models;
-using CMS.Plugin.ProcessManagement.Abstractions.Models;
-using CMS.Plugin.TraceManagement.Abstractions.Models.Traces;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using SYC.Flow.Kernel;
-using Volo.Abp.DependencyInjection;
-using Volo.Abp.Uow;
-
-namespace CMS.Plugin.HIAWms.FlowProcessors
-{
- /// <summary>
- /// 娴佺▼澶勭悊鍣�
- /// </summary>
- public class HIAWmsFlowProcessor : IFlowProcessor, ISingletonDependency
- {
- private readonly ILogger<HIAWmsFlowProcessor> _logger;
- private readonly IServiceProvider _serviceProvider;
-
- /// <summary>
- /// Initializes a new instance of the <see cref="FlowProcessor"/> class.
- /// </summary>
- public HIAWmsFlowProcessor(ILogger<HIAWmsFlowProcessor> logger, IServiceProvider serviceProvider)
- {
- _logger = logger;
- _serviceProvider = serviceProvider;
- }
-
- /// <inheritdoc />
- public Task OnEnterAsync(FlowProcessor flowProcessor, object sender, EventArgs args)
- {
- return Task.CompletedTask;
- }
-
- /// <inheritdoc />
- public async Task OnExecuteAsync(FlowProcessor flowProcessor, object sender, EventArgs args)
- {
- if (sender is Activity activity)
- {
- var eventArgs = args as ProcessflowEventArgs;
- var procID = eventArgs.DataItems["Instance_ProcID"];
- if (activity?.Name == "绗笁鏂圭郴缁熷悎鏍煎垽鏂�")
- {
- // 宸ヨ壓妯″瀷
- var processModel = eventArgs.DataItems.ApplicationData as ProcessModel;
-
- // 宸ュ崟妯″瀷
- var orderModel = eventArgs.DataItems[FlowItemCollection.OrderModel] as OrderModel;
-
- // 浜у搧妯″瀷
- var productModel = eventArgs.DataItems[FlowItemCollection.ProductModel] as AssociationProductModel;
-
- // 杩芥函妯″瀷
- var traceModel = eventArgs.DataItems[FlowItemCollection.TraceModel] as TraceModel;
-
- // 涓氬姟澶勭悊
- await ProcessAsync();
-
- _logger.LogInformation($"鎵ц娴佺▼锛氬疄渚�={procID} -> {flowProcessor.ProcName} -> {activity.Name} ProductionFlowProcessor");
- }
- }
- }
-
- /// <summary>
- /// Processes the asynchronous.
- /// </summary>
- private async Task ProcessAsync()
- {
- using var scope = _serviceProvider.CreateScope();
- var unitOfWorkManager = scope.ServiceProvider.GetRequiredService<IUnitOfWorkManager>();
- using var uow = unitOfWorkManager.Begin(requiresNew: true);
- var wmscontainerRepository = scope.ServiceProvider.GetRequiredService<IWmsContainerRepository>();
- var count = await wmscontainerRepository.GetCountAsync();
-
- // 濡傛灉鏈夋洿鏂版暟鎹簱鎿嶄綔锛岄渶鎻愪氦淇濆瓨
- // await uow.SaveChangesAsync();
-
- _logger.LogInformation($"ProcessAsync锛孋ount={count}");
- }
-
- /// <inheritdoc />
- public Task OnExitAsync(FlowProcessor flowProcessor, object sender, EventArgs args)
- {
- return Task.CompletedTask;
- }
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/Flows/50001_1.pfd" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/Flows/50001_1.pfd"
deleted file mode 100644
index 85b41af..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/Flows/50001_1.pfd"
+++ /dev/null
@@ -1,158 +0,0 @@
-<ProcessflowDefine Version="1">
- <Define>
- <ProcessflowBuilder xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
- <Parameters/>
- <Name>HIAWms涓氬姟娴佺▼</Name>
- <Description></Description>
- <Root xsi:type="Activity">
- <Alias>鍚姩</Alias>
- <Name>鍚姩</Name>
- <Description></Description>
- <EnterMode>Automatic</EnterMode>
- <ExitMode>Automatic</ExitMode>
- <JoinType>JoinXOR</JoinType>
- <SplitType>SplitXOR</SplitType>
- <ExtendedProperty></ExtendedProperty>
- </Root>
- <Activities>
- <Activity xsi:type="VariableMonitorActivity">
- <Alias>鍙橀噺鐩戝惉</Alias>
- <Name>瑙﹀彂淇″彿鐩戝惉</Name>
- <EnterMode>Automatic</EnterMode>
- <ExitMode>Automatic</ExitMode>
- <JoinType>JoinXOR</JoinType>
- <SplitType>SplitXOR</SplitType>
- <NeedTagChange>true</NeedTagChange>
- <TaskDelay>0</TaskDelay>
- <MonitorVariableName>HIAWms_TriggerSignal</MonitorVariableName>
- <CompareVariableValue>1</CompareVariableValue>
- <ExtendedProperty></ExtendedProperty>
- </Activity>
- <Activity xsi:type="VariableReadActivity">
- <Alias>鍙橀噺璇诲彇</Alias>
- <Name>鍙橀噺璇诲彇</Name>
- <EnterMode>Automatic</EnterMode>
- <ExitMode>Automatic</ExitMode>
- <JoinType>JoinXOR</JoinType>
- <SplitType>SplitXOR</SplitType>
- <TaskDelay>0</TaskDelay>
- <ReadRetryCount>10</ReadRetryCount>
- <ReadRetryDelay>500</ReadRetryDelay>
- <ExtendedProperty></ExtendedProperty>
- <ParameterVariables>
- <ReadParameterVariable>
- <VariableName>HIAWms_BarcodeVariable</VariableName>
- <WriteIntoExtAttribute>true</WriteIntoExtAttribute>
- </ReadParameterVariable>
- </ParameterVariables>
- </Activity>
- <Activity xsi:type="HIAWmsActivity">
- <Alias>鍙橀噺鐩戝惉</Alias>
- <Name>鎵╁睍姝ラ</Name>
- <EnterMode>Automatic</EnterMode>
- <ExitMode>Automatic</ExitMode>
- <JoinType>JoinXOR</JoinType>
- <SplitType>SplitXOR</SplitType>
- <TaskDelay>0</TaskDelay>
- <MyProperty>MyProperty1</MyProperty>
- <ExtendedProperty></ExtendedProperty>
- </Activity>
- <Activity xsi:type="VariableMonitorActivity">
- <Alias>鍙橀噺鐩戝惉</Alias>
- <Name>瑙﹀彂淇″彿澶嶄綅鐩戝惉</Name>
- <EnterMode>Automatic</EnterMode>
- <ExitMode>Automatic</ExitMode>
- <JoinType>JoinXOR</JoinType>
- <SplitType>SplitXOR</SplitType>
- <NeedTagChange>true</NeedTagChange>
- <TaskDelay>0</TaskDelay>
- <MonitorVariableName>HIAWms_TriggerSignal</MonitorVariableName>
- <CompareVariableValue>0</CompareVariableValue>
- <ExtendedProperty></ExtendedProperty>
- </Activity>
- <Activity xsi:type="BusinessActivity">
- <Alias>閫氱敤姝ラ</Alias>
- <Name>閫氱敤姝ラ</Name>
- <EnterMode>Automatic</EnterMode>
- <ExitMode>Automatic</ExitMode>
- <JoinType>JoinXOR</JoinType>
- <SplitType>SplitXOR</SplitType>
- <PublishFlowEvent>true</PublishFlowEvent>
- <TaskDelay>0</TaskDelay>
- <ExtendedProperty>
- <MyExtendedProperty>MyExtendedProperty1</MyExtendedProperty>
- </ExtendedProperty>
- </Activity>
- <Activity xsi:type="VariableWriteActivity">
- <Alias>鍙橀噺涓嬪彂</Alias>
- <Name>鍙橀噺涓嬪彂</Name>
- <EnterMode>Automatic</EnterMode>
- <ExitMode>Automatic</ExitMode>
- <JoinType>JoinXOR</JoinType>
- <SplitType>SplitXOR</SplitType>
- <TaskDelay>0</TaskDelay>
- <WriteRetryCount>10</WriteRetryCount>
- <WriteRetryDelay>500</WriteRetryDelay>
- <ParameterVariables>
- <WriteParameterVariable>
- <Sort>1</Sort>
- <WriteVariableName>HIAWms_BarcodeVariable</WriteVariableName>
- <WriteVariableValue></WriteVariableValue>
- </WriteParameterVariable>
- </ParameterVariables>
- <ExtendedProperty></ExtendedProperty>
- </Activity>
- <Activity xsi:type="EndActivity">
- <Alias>缁撴潫</Alias>
- <Name>缁撴潫</Name>
- <EnterMode>Automatic</EnterMode>
- <ExitMode>Automatic</ExitMode>
- <JoinType>JoinXOR</JoinType>
- <SplitType>SplitXOR</SplitType>
- <ExtendedProperty></ExtendedProperty>
- </Activity>
- </Activities>
- <Transitions>
- <Transition>
- <Label>鍚姩->瑙﹀彂淇″彿鐩戝惉</Label>
- <Source>鍚姩</Source>
- <Sink>瑙﹀彂淇″彿鐩戝惉</Sink>
- </Transition>
- <Transition>
- <Label>瑙﹀彂淇″彿鐩戝惉->鍙橀噺璇诲彇</Label>
- <Source>瑙﹀彂淇″彿鐩戝惉</Source>
- <Sink>鍙橀噺璇诲彇</Sink>
- </Transition>
- <Transition>
- <Label>鍙橀噺璇诲彇->鎵╁睍姝ラ</Label>
- <Source>鍙橀噺璇诲彇</Source>
- <Sink>鎵╁睍姝ラ</Sink>
- </Transition>
- <Transition>
- <Label>鎵╁睍姝ラ->瑙﹀彂淇″彿澶嶄綅鐩戝惉</Label>
- <Source>鎵╁睍姝ラ</Source>
- <Sink>瑙﹀彂淇″彿澶嶄綅鐩戝惉</Sink>
- </Transition>
- <Transition>
- <Label>瑙﹀彂淇″彿澶嶄綅鐩戝惉->閫氱敤姝ラ</Label>
- <Source>瑙﹀彂淇″彿澶嶄綅鐩戝惉</Source>
- <Sink>閫氱敤姝ラ</Sink>
- </Transition>
- <Transition>
- <Label>閫氱敤姝ラ->鍙橀噺涓嬪彂</Label>
- <Source>閫氱敤姝ラ</Source>
- <Sink>鍙橀噺涓嬪彂</Sink>
- </Transition>
- <Transition>
- <Label>鍙橀噺涓嬪彂->缁撴潫</Label>
- <Source>鍙橀噺涓嬪彂</Source>
- <Sink>缁撴潫</Sink>
- </Transition>
- </Transitions>
- </ProcessflowBuilder>
- </Define>
- <Appearance>
- <ProcessflowAppearance xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
- </ProcessflowAppearance>
- </Appearance>
-</ProcessflowDefine>
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/FodyWeavers.xml" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/FodyWeavers.xml"
deleted file mode 100644
index 9a2e2c4..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/FodyWeavers.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-锘�<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
- <ConfigureAwait ContinueOnCapturedContext="false" />
-</Weavers>
\ No newline at end of file
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/Jobs/HIAWmsArgs.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/Jobs/HIAWmsArgs.cs"
deleted file mode 100644
index 5354955..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/Jobs/HIAWmsArgs.cs"
+++ /dev/null
@@ -1,18 +0,0 @@
-namespace CMS.Plugin.HIAWms.Jobs
-{
- /// <summary>
- /// HIAWms 浣滀笟鍙傛暟
- /// </summary>
- public class HIAWmsArgs
- {
- /// <summary>
- /// Gets or sets the subject.
- /// </summary>
- public string Subject { get; set; }
-
- /// <summary>
- /// Gets or sets the body.
- /// </summary>
- public string Body { get; set; }
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/Jobs/HIAWmsJob.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/Jobs/HIAWmsJob.cs"
deleted file mode 100644
index 9f33568..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/Jobs/HIAWmsJob.cs"
+++ /dev/null
@@ -1,43 +0,0 @@
-using CMS.Plugin.HIAWms.Domain.WmsContainers;
-using Microsoft.Extensions.Logging;
-using Volo.Abp.BackgroundJobs;
-using Volo.Abp.DependencyInjection;
-using Volo.Abp.Uow;
-
-namespace CMS.Plugin.HIAWms.Jobs
-{
- /// <summary>
- /// HIAWms 鍚庡彴浣滀笟
- /// </summary>
- public class HIAWmsJob : BackgroundJob<HIAWmsArgs>, ITransientDependency
- {
- private readonly ILogger<HIAWmsJob> _logger;
- private readonly IUnitOfWorkManager _unitOfWorkManager;
- private readonly IWmsContainerRepository _wmscontainerRepository;
-
- /// <summary>
- /// Initializes a new instance of the <see cref="HIAWmsJob"/> class.
- /// </summary>
- /// <param name="logger">The logger.</param>
- /// <param name="unitOfWorkManager">The unit of work manager.</param>
- /// <param name="wmscontainerRepository">My entity name repository.</param>
- public HIAWmsJob(ILogger<HIAWmsJob> logger, IUnitOfWorkManager unitOfWorkManager, IWmsContainerRepository wmscontainerRepository)
- {
- _logger = logger;
- _unitOfWorkManager = unitOfWorkManager;
- _wmscontainerRepository = wmscontainerRepository;
- }
-
- /// <inheritdoc />
- public override void Execute(HIAWmsArgs args)
- {
- using var uow = _unitOfWorkManager.Begin(requiresNew: true);
- var count = _wmscontainerRepository.GetCountAsync().GetAwaiter().GetResult();
-
- // 濡傛灉鏈夋洿鏂版暟鎹簱鎿嶄綔锛岄渶鎻愪氦淇濆瓨
- // uow.SaveChangesAsync().GetAwaiter().GetResult();
-
- _logger.LogInformation($"HIAWmsJob Execute锛孲ubject={args.Subject}锛孊ody={args.Body}锛孋ount={count}");
- }
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/ProjectService/HIAWmsProjectService.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/ProjectService/HIAWmsProjectService.cs"
deleted file mode 100644
index fcc707e..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/ProjectService/HIAWmsProjectService.cs"
+++ /dev/null
@@ -1,165 +0,0 @@
-using CMS.Plugin.FlowManagement.Abstractions.FlowBusiness;
-using CMS.Plugin.HIAWms.Apis;
-using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsContainers;
-using CMS.Plugin.HIAWms.Domain.WmsContainers;
-using CMS.Plugin.HIAWms.Jobs;
-using CMS.Project;
-using CMS.Project.Abstractions;
-using CMS.Unit.RuntimeValue.Abstractions;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using Volo.Abp.BackgroundJobs;
-using Volo.Abp.Uow;
-
-namespace CMS.Plugin.HIAWms.ProjectService
-{
- /// <summary>
- /// 宸ョ▼鏈嶅姟锛屽拰宸ョ▼鍏宠仈鐨勫悗鍙版湇鍔★紝褰�<see cref="IProjectServiceRunner"/>浠ュ綋鍓岾ey璋冪敤鏃朵細琚墽琛�
- /// </summary>
- public class HIAWmsProjectService : BaseProjectService
- {
- private IServiceProvider _serviceProvider;
- private readonly ILogger<HIAWmsProjectService> _logger;
- private readonly IVariableDataCache _variableDataCache;
- private FlowVariableChannelListener _channelListener;
- private Dictionary<string, string> _monitorVariableNames;
-
- /// <summary>
- /// 鏈嶅姟鐨凨ey锛屽敮涓�锛屼緵<see cref="IProjectServiceRunner"/>浣跨敤
- /// </summary>
- public override string Key => "HIAWms";
-
- /// <summary>
- /// 鏈嶅姟鎻忚堪锛屾樉绀哄湪鏈嶅姟鍒楄〃UI涓婄殑鍚嶇О
- /// </summary>
- public override string Description => "HIAWms鏈嶅姟";
-
- /// <summary>
- /// 鍚敤鎺堟潈
- /// </summary>
- public override bool AuthRequired => false;
-
- /// <summary>
- /// Initializes a new instance of the <see cref="HIAWmsProjectService"/> class.
- /// </summary>
- /// <param name="logger">The logger.</param>
- /// <param name="variableDataCache">The variable data cache.</param>
- public HIAWmsProjectService(IServiceProvider serviceProvider, ILogger<HIAWmsProjectService> logger, IVariableDataCache variableDataCache)
- {
- _serviceProvider = serviceProvider;
- _logger = logger;
- _variableDataCache = variableDataCache;
- }
-
- /// <summary>
- /// 寮�鍚湇鍔�
- /// </summary>
- /// <param name="serviceProvider">鍏锋湁宸ョ▼涓婁笅鏂囩殑瀹炰緥</param>
- public override async Task StartAsync(IServiceProvider serviceProvider)
- {
- if (State == ProjectServiceState.Started)
- {
- return;
- }
-
- // 鐩戝惉鍙橀噺
- _monitorVariableNames = new Dictionary<string, string>
- {
- { "HIAWms_Variable1", "鐩戝惉鍙橀噺1" },
- { "HIAWms_Variable2", "鐩戝惉鍙橀噺2" }
- };
-
- // 鍒涘缓閫氶亾鐩戝惉
- _channelListener?.Token?.Dispose();
- _channelListener = new FlowVariableChannelListener(_logger, _variableDataCache);
- _channelListener.CreateChannel(Key, waitListener: false, timeout: TimeSpan.FromSeconds(30), variableFilter: _monitorVariableNames.Keys.ToHashSet());
- _channelListener.TagChanged += OnTagValueChanged;
-
- await base.StartAsync(serviceProvider);
- }
-
- /// <summary>
- /// 鍋滄鏈嶅姟
- /// </summary>
- /// <param name="serviceProvider">鍏锋湁宸ョ▼涓婁笅鏂囩殑瀹炰緥</param>
- public override async Task StopAsync(IServiceProvider serviceProvider)
- {
- if (_channelListener != null)
- {
- // 閲婃斁鐩戝惉
- _channelListener.TagChanged -= OnTagValueChanged;
- _channelListener.Token.Dispose();
- _channelListener = null;
- }
-
- // 浣跨敤鍚庡彴浣滀笟寮傛澶勭悊
- //await _serviceProvider.GetRequiredService<IBackgroundJobManager>().EnqueueAsync(new HIAWmsArgs
- //{
- // Subject = "HIAWms_Subject",
- // Body = "HIAWms_Body",
- //});
-
-
- await base.StopAsync(serviceProvider);
- }
-
- /// <summary>
- /// Called when [tag value changed].
- /// </summary>
- /// <param name="sender">The sender.</param>
- /// <param name="e">The <see cref="TagChangedEventArgs"/> instance containing the event data.</param>
- private async void OnTagValueChanged(object sender, TagChangedEventArgs e)
- {
- var changeds = e.Changeds.Where(x => _monitorVariableNames != null && _monitorVariableNames.ContainsKey(x.Name));
- if (!changeds.Any())
- {
- return;
- }
-
- foreach (var changed in changeds)
- {
- var oldValue = changed.Old?.Value;
- var newValue = changed.New?.Value;
- var traceId = e.TraceId;
-
- _logger.LogInformation($"{changed.Name} 鍙橀噺鍊煎彂鐢熷彉鍖栵紝鏃у�納oldValue}=鏂板�納newValue}锛孴raceId={traceId}");
-
- // TODO: 澶勭悊鍙橀噺鍊煎彉鍖�
- // Tips锛歨ttps://cms-docs.shengyc.com/cms/api/%E5%90%8E%E7%AB%AF#3-%E5%8F%98%E9%87%8F%E6%A8%A1%E5%9D%97
- /* 璇存槑锛氶�氳繃璁㈤槄 IVariableDataCache.TagChanged 浜嬩欢锛屾偍鍙互瀹炴椂鐩戞帶鍙橀噺鐨勫彉鍖栥�傛浜嬩欢浼氫紶閫掓墍鏈夊彉閲忚嚦浜嬩欢澶勭悊鍑芥暟锛屽洜姝わ紝涓氬姟灞傞渶鍦ㄥ嚱鏁颁腑绛涢�夊叧娉ㄧ殑鍙橀噺銆�
- 娉ㄦ剰浜嬮」锛�
- 锛�1锛夋�ц兘褰卞搷锛� 鍙戝竷浜嬩欢鏃讹紝浜嬩欢鐨勫彂閫佽�呭皢闃诲娴佺▼銆傚洜姝わ紝寮虹儓寤鸿閬垮厤鍦ㄤ簨浠跺鐞嗗嚱鏁颁腑鎵ц I/ O 鎿嶄綔銆丠TTP 鎺ュ彛璁块棶鎴栧叾浠栬�楁椂鎿嶄綔锛屼互闃叉瀵圭郴缁熸�ц兘浜х敓涓ラ噸褰卞搷锛屽鑷存暣涓郴缁熷搷搴斿欢杩熴��
- 锛�2锛夐珮棰戠巼瑙﹀彂锛� 鐢变簬浜嬩欢璁㈤槄浜嗗叏閲忓彉閲忥紝瑙﹀彂棰戠巼鍙兘闈炲父楂樸��
- 锛�3锛夊紓姝ュ鐞嗭細 閴翠簬浜嬩欢瑙﹀彂棰戠巼寰堥珮锛屽缓璁笟鍔″眰鍦ㄧ瓫閫夊叧娉ㄥ彉閲忓悗锛屼娇鐢� Task 鍚姩鏂扮嚎绋嬪鐞嗕笟鍔￠�昏緫锛屼互閬垮厤闃诲鏍稿績鐨勫彉閲忕洃鍚姛鑳斤紝瀹炵幇涓氬姟灞備笌骞冲彴鍩哄骇鐨勮В鑰︺��
- 锛�4锛夊苟鍙戠鐞嗭細 濡傛灉涓氬姟灞傚苟鍙戦噺澶э紝蹇呴』浼樺寲浠ｇ爜璁捐鍜屽疄鏂斤紝浠ュ噺灏戝湪楂樺苟鍙戞儏鍐典笅鐨勭郴缁熻祫婧愭秷鑰楋紝闃叉绯荤粺鎬ц兘闂銆�
- 锛�5锛変唬鐮佸畨鍏細 瀹夎骞朵娇鐢� CMS.CodeAnalysis 鍒嗘瀽鍣ㄦ潵鍒嗘瀽 IVariableDataCache.TagChanged 鐨勪娇鐢ㄦ儏鍐点�傝宸ュ叿鑳藉湪浣跨敤涓嶅綋鏃舵彁渚涚紪璇戦敊璇紝甯姪鎮ㄦ彁楂樹唬鐮佽川閲忋��*/
-
- _ = Task.Run(async () =>
- {
- // 渚�1锛氬悓姝ュ鐞�
- //await ProcessAsync();
-
- // 渚�2锛氳皟鐢ㄥ閮ˋPI
- //await ExecuteExternalApiAsync();
- });
- }
- }
-
- /// <summary>
- /// Processes the asynchronous.
- /// </summary>
- private async Task ProcessAsync()
- {
- using var scope = _serviceProvider.CreateScope();
- var unitOfWorkManager = scope.ServiceProvider.GetRequiredService<IUnitOfWorkManager>();
- using var uow = unitOfWorkManager.Begin(requiresNew: true);
- var wmscontainerRepository = scope.ServiceProvider.GetRequiredService<IWmsContainerRepository>();
- var count = await wmscontainerRepository.GetCountAsync();
-
- // 濡傛灉鏈夋洿鏂版暟鎹簱鎿嶄綔锛岄渶鎻愪氦淇濆瓨
- // await uow.SaveChangesAsync();
-
- _logger.LogInformation($"ProcessAsync锛孋ount={count}");
- }
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/Resources/Templates/WmsArea\345\257\274\345\207\272\346\250\241\346\235\277.xlsx" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/Resources/Templates/WmsArea\345\257\274\345\207\272\346\250\241\346\235\277.xlsx"
deleted file mode 100644
index 8096a4d..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/Resources/Templates/WmsArea\345\257\274\345\207\272\346\250\241\346\235\277.xlsx"
+++ /dev/null
Binary files differ
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/Resources/Templates/WmsContainer\345\257\274\345\207\272\346\250\241\346\235\277.xlsx" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/Resources/Templates/WmsContainer\345\257\274\345\207\272\346\250\241\346\235\277.xlsx"
deleted file mode 100644
index 57d6b44..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/Resources/Templates/WmsContainer\345\257\274\345\207\272\346\250\241\346\235\277.xlsx"
+++ /dev/null
Binary files differ
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/Resources/Templates/WmsMaterial\345\257\274\345\207\272\346\250\241\346\235\277.xlsx" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/Resources/Templates/WmsMaterial\345\257\274\345\207\272\346\250\241\346\235\277.xlsx"
deleted file mode 100644
index 16a561b..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/Resources/Templates/WmsMaterial\345\257\274\345\207\272\346\250\241\346\235\277.xlsx"
+++ /dev/null
Binary files differ
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/Resources/Templates/WmsPlace\345\257\274\345\207\272\346\250\241\346\235\277.xlsx" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/Resources/Templates/WmsPlace\345\257\274\345\207\272\346\250\241\346\235\277.xlsx"
deleted file mode 100644
index ccb12f5..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/Resources/Templates/WmsPlace\345\257\274\345\207\272\346\250\241\346\235\277.xlsx"
+++ /dev/null
Binary files differ
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/Resources/Templates/WmsStore\345\257\274\345\207\272\346\250\241\346\235\277.xlsx" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/Resources/Templates/WmsStore\345\257\274\345\207\272\346\250\241\346\235\277.xlsx"
deleted file mode 100644
index c70c1c3..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/Resources/Templates/WmsStore\345\257\274\345\207\272\346\250\241\346\235\277.xlsx"
+++ /dev/null
Binary files differ
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/Services/HIAWmsFlowService.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/Services/HIAWmsFlowService.cs"
deleted file mode 100644
index a85ecbd..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/Services/HIAWmsFlowService.cs"
+++ /dev/null
@@ -1,43 +0,0 @@
-using CMS.Plugin.HIAWms.Abstractions;
-using CMS.Plugin.HIAWms.Domain.WmsContainers;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using SYC.Flow.Kernel;
-using Volo.Abp.DependencyInjection;
-using Volo.Abp.Uow;
-
-namespace CMS.Plugin.HIAWms.Services
-{
- /// <inheritdoc />
- public class HIAWmsFlowService : IHIAWmsFlowService, ITransientDependency
- {
- private readonly ILogger<HIAWmsFlowService> _logger;
- private readonly IServiceProvider _serviceProvider;
-
- /// <summary>
- /// Initializes a new instance of the <see cref="HIAWmsFlowService"/> class.
- /// </summary>
- /// <param name="logger">The logger.</param>
- public HIAWmsFlowService(ILogger<HIAWmsFlowService> logger, IServiceProvider serviceProvider)
- {
- _logger = logger;
- _serviceProvider = serviceProvider;
- }
-
- /// <inheritdoc />
- public async Task ProcessAsync(ProcessflowEventArgs args)
- {
- using var scope = _serviceProvider.CreateScope();
- var unitOfWorkManager = scope.ServiceProvider.GetRequiredService<IUnitOfWorkManager>();
- using var uow = unitOfWorkManager.Begin(requiresNew: true);
- var wmscontainerRepository = scope.ServiceProvider.GetRequiredService<IWmsContainerRepository>();
- var count = await wmscontainerRepository.GetCountAsync();
-
- // 濡傛灉鏈夋洿鏂版暟鎹簱鎿嶄綔锛岄渶鎻愪氦淇濆瓨
- // await uow.SaveChangesAsync();
-
- // 杈撳嚭鏃ュ織
- _logger.LogInformation($"HIAWmsFlowService锛歅rocessAsync()");
- }
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/Workers/HIAWmsWorker.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/Workers/HIAWmsWorker.cs"
deleted file mode 100644
index 6948d27..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/Workers/HIAWmsWorker.cs"
+++ /dev/null
@@ -1,76 +0,0 @@
-using CMS.Extensions.Variable;
-using CMS.Project.Abstractions;
-using KissUtil.Extensions;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using Volo.Abp.BackgroundWorkers;
-using Volo.Abp.Threading;
-
-namespace CMS.Plugin.HIAWms.Workers
-{
- /// <summary>
- /// HIAWms鍚庡彴宸ヤ綔鑰�
- /// </summary>
- public class HIAWmsWorker : AsyncPeriodicBackgroundWorkerBase
- {
- private readonly ILogger<HIAWmsWorker> _logger;
- private readonly VariableService _variableService;
-
- /// <summary>
- /// Initializes a new instance of the <see cref="HIAWmsWorker"/> class.
- /// </summary>
- /// <param name="timer">The timer.</param>
- /// <param name="serviceScopeFactory">The service scope factory.</param>
- public HIAWmsWorker(ILogger<HIAWmsWorker> logger, AbpAsyncTimer timer, VariableService variableService, IServiceScopeFactory serviceScopeFactory) : base(timer, serviceScopeFactory)
- {
- _logger = logger;
- _variableService = variableService;
- Timer.Period = 1 * 300 * 1000; // 姣忛殧 300 绉� 鎵ц涓�娆�
- Timer.RunOnStart = true;
- }
-
- /// <inheritdoc />
- protected override async Task DoWorkAsync(PeriodicBackgroundWorkerContext workerContext)
- {
- var projectAccessor = workerContext.ServiceProvider.GetRequiredService<IProjectAccessor>();
- var project = await projectAccessor.GetProjectAsync();
- if (project?.Info == null)
- {
- return;
- }
-
- //_logger.LogInformation($"HIAWmsWorker is working for project {project.Info.Id}");
-
- //// 璁＄畻OEE
- //double oee = await CalculateOEEAsync();
-
- //// 浣跨敤鐧惧垎姣旀牸寮� 鎵撳嵃缁撴灉鏃ュ織
- //_logger.LogInformation($"OEE:{oee:P2}");
-
- //// 鍐欏叆鍙橀噺
- //await _variableService.WriteValueAsync(new Dictionary<string, object> {{ "OEE", oee } });
- }
-
- // 璁＄畻OEE=鍙敤鎬楁�ц兘脳璐ㄩ噺
- public async Task<double> CalculateOEEAsync()
- {
- // 璇诲彇OEE璁＄畻鎵�闇�鐨勫��
- double availability = await ReadDoubleValueAsync("Availability");
- double performance = await ReadDoubleValueAsync("Performance");
- double quality = await ReadDoubleValueAsync("Quality");
-
- // 璁＄畻OEE
- double oee = availability * performance * quality;
-
- // 杩斿洖璁＄畻缁撴灉
- return oee;
- }
-
- // 鎻愪緵涓�涓硾鍨嬫柟娉曪紝鏂逛究鐩存帴鑾峰彇double绫诲瀷鐨勫��
- public async Task<double> ReadDoubleValueAsync(string variableName)
- {
- var variable = await _variableService.ReadValueAsync(variableName);
- return (variable?.Content?.Value).SafeString().ToDoubleOrNull().GetValueOrDefault();
- }
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/appsettings.json" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/appsettings.json"
deleted file mode 100644
index f7a6300..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/appsettings.json"
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- // 閰嶇疆鏂囦欢灏藉彲鑳藉啓鍦�/host/appsettings.json鎴栨暟鎹簱涓紝閬垮厤鎻掍欢鍗囩骇鏃惰瑕嗙洊
- "IHIAWmsExternalApi": {
- "HttpHost": "http://127.0.0.1:18000/" // External API瀵规帴鍦板潃
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/test/CMS.Plugin.HIAWms.Application.Tests/CMS.Plugin.HIAWms.Application.Tests.csproj" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/test/CMS.Plugin.HIAWms.Application.Tests/CMS.Plugin.HIAWms.Application.Tests.csproj"
deleted file mode 100644
index 135f97a..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/test/CMS.Plugin.HIAWms.Application.Tests/CMS.Plugin.HIAWms.Application.Tests.csproj"
+++ /dev/null
@@ -1,17 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
- <Import Project="../../common.test.props" />
-
- <PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
- </PropertyGroup>
-
- <ItemGroup>
- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
- </ItemGroup>
-
- <ItemGroup>
- <ProjectReference Include="..\..\src\CMS.Plugin.HIAWms.Application\CMS.Plugin.HIAWms.Application.csproj" />
- <ProjectReference Include="..\CMS.Plugin.HIAWms.Domain.Tests\CMS.Plugin.HIAWms.Domain.Tests.csproj" />
- </ItemGroup>
-
-</Project>
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/test/CMS.Plugin.HIAWms.Application.Tests/HIAWmsApplicationTestBase.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/test/CMS.Plugin.HIAWms.Application.Tests/HIAWmsApplicationTestBase.cs"
deleted file mode 100644
index 905c958..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/test/CMS.Plugin.HIAWms.Application.Tests/HIAWmsApplicationTestBase.cs"
+++ /dev/null
@@ -1,38 +0,0 @@
-using CMS.Plugin.HIAWms.EntityFrameworkCore;
-using CMS.Plugin.HIAWms.MySQL;
-using CMS.Plugin.HIAWms.TestBase;
-
-namespace CMS.Plugin.HIAWms.Application.Tests
-{
- /// <summary>
- /// HIAWmsApplicationTestBase
- /// </summary>
- public class HIAWmsApplicationTestBase : HIAWmsTestBase<HIAWmsApplicationTestModule>
- {
- /// <summary>
- /// UsingDbContext
- /// </summary>
- /// <param name="action">IHIAWmsDbContext</param>
- protected virtual void UsingDbContext(Action<CMSPluginDbContext> action)
- {
- using (var dbContext = GetRequiredService<CMSPluginDbContext>())
- {
- action.Invoke(dbContext);
- }
- }
-
- /// <summary>
- /// UsingDbContext
- /// </summary>
- /// <typeparam name="T">T</typeparam>
- /// <param name="action">IHIAWmsDbContext</param>
- /// <returns>T</returns>
- protected virtual T UsingDbContext<T>(Func<CMSPluginDbContext, T> action)
- {
- using (var dbContext = GetRequiredService<CMSPluginDbContext>())
- {
- return action.Invoke(dbContext);
- }
- }
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/test/CMS.Plugin.HIAWms.Application.Tests/HIAWmsApplicationTestModule.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/test/CMS.Plugin.HIAWms.Application.Tests/HIAWmsApplicationTestModule.cs"
deleted file mode 100644
index 2cd5ae3..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/test/CMS.Plugin.HIAWms.Application.Tests/HIAWmsApplicationTestModule.cs"
+++ /dev/null
@@ -1,19 +0,0 @@
-using CMS.Plugin.HIAWms.Domain.Tests;
-using Volo.Abp.Modularity;
-
-namespace CMS.Plugin.HIAWms.Application.Tests
-{
- /// <summary>
- /// HIAWmsApplicationTestModule
- /// </summary>
- [DependsOn(
- typeof(CMSPluginApplicationModule),
- typeof(HIAWmsDomainTestModule))]
- public class HIAWmsApplicationTestModule : AbpModule
- {
- public override void ConfigureServices(ServiceConfigurationContext context)
- {
- base.ConfigureServices(context);
- }
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/test/CMS.Plugin.HIAWms.Domain.Tests/CMS.Plugin.HIAWms.Domain.Tests.csproj" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/test/CMS.Plugin.HIAWms.Domain.Tests/CMS.Plugin.HIAWms.Domain.Tests.csproj"
deleted file mode 100644
index 818d8b4..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/test/CMS.Plugin.HIAWms.Domain.Tests/CMS.Plugin.HIAWms.Domain.Tests.csproj"
+++ /dev/null
@@ -1,16 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
- <Import Project="../../common.test.props" />
-
- <PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
- </PropertyGroup>
-
- <ItemGroup>
- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkPackageVersion)" />
- </ItemGroup>
-
- <ItemGroup>
- <ProjectReference Include="..\CMS.Plugin.HIAWms.EntityFrameworkCore.Tests\CMS.Plugin.HIAWms.EntityFrameworkCore.Tests.csproj" />
- </ItemGroup>
-
-</Project>
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/test/CMS.Plugin.HIAWms.Domain.Tests/HIAWmsDomainTestBase.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/test/CMS.Plugin.HIAWms.Domain.Tests/HIAWmsDomainTestBase.cs"
deleted file mode 100644
index 6de6ac6..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/test/CMS.Plugin.HIAWms.Domain.Tests/HIAWmsDomainTestBase.cs"
+++ /dev/null
@@ -1,38 +0,0 @@
-using CMS.Plugin.HIAWms.EntityFrameworkCore;
-using CMS.Plugin.HIAWms.MySQL;
-using CMS.Plugin.HIAWms.TestBase;
-
-namespace CMS.Plugin.HIAWms.Domain.Tests
-{
- /// <summary>
- /// HIAWms DomainTestBase
- /// </summary>
- public class HIAWmsDomainTestBase : HIAWmsTestBase<HIAWmsDomainTestModule>
- {
- /// <summary>
- /// UsingDbContext
- /// </summary>
- /// <param name="action">IHIAWmsDbContext</param>
- protected virtual void UsingDbContext(Action<CMSPluginDbContext> action)
- {
- using (var dbContext = GetRequiredService<CMSPluginDbContext>())
- {
- action.Invoke(dbContext);
- }
- }
-
- /// <summary>
- /// UsingDbContext
- /// </summary>
- /// <typeparam name="T">T</typeparam>
- /// <param name="action">IHIAWmsDbContext</param>
- /// <returns>T</returns>
- protected virtual T UsingDbContext<T>(Func<CMSPluginDbContext, T> action)
- {
- using (var dbContext = GetRequiredService<CMSPluginDbContext>())
- {
- return action.Invoke(dbContext);
- }
- }
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/test/CMS.Plugin.HIAWms.Domain.Tests/HIAWmsDomainTestModule.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/test/CMS.Plugin.HIAWms.Domain.Tests/HIAWmsDomainTestModule.cs"
deleted file mode 100644
index c30453c..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/test/CMS.Plugin.HIAWms.Domain.Tests/HIAWmsDomainTestModule.cs"
+++ /dev/null
@@ -1,13 +0,0 @@
-using CMS.Plugin.HIAWms.EntityFrameworkCore.Tests;
-using Volo.Abp.Modularity;
-
-namespace CMS.Plugin.HIAWms.Domain.Tests
-{
- /// <summary>
- /// HIAWms DomainTestModule
- /// </summary>
- [DependsOn(typeof(HIAWmsTestEntityFrameworkCoreModule))]
- public class HIAWmsDomainTestModule : AbpModule
- {
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/test/CMS.Plugin.HIAWms.EntityFrameworkCore.Tests/CMS.Plugin.HIAWms.EntityFrameworkCore.Tests.csproj" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/test/CMS.Plugin.HIAWms.EntityFrameworkCore.Tests/CMS.Plugin.HIAWms.EntityFrameworkCore.Tests.csproj"
deleted file mode 100644
index cc0f355..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/test/CMS.Plugin.HIAWms.EntityFrameworkCore.Tests/CMS.Plugin.HIAWms.EntityFrameworkCore.Tests.csproj"
+++ /dev/null
@@ -1,25 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
- <Import Project="../../common.test.props" />
-
- <PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
- </PropertyGroup>
-
- <ItemGroup>
- <PackageReference Include="Volo.Abp.EntityFrameworkCore" Version="$(ABPPackageVersion)" />
- <PackageReference Include="Volo.Abp.EntityFrameworkCore.Sqlite" Version="$(ABPPackageVersion)" />
- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkPackageVersion)" />
- <PackageReference Include="NSubstitute" Version="$(NSubstitutePackageVersion)" />
- <PackageReference Include="Shouldly" Version="$(ShouldlyPackageVersion)" />
- <PackageReference Include="xunit" Version="$(xUnitPackageVersion)" />
- <PackageReference Include="xunit.extensibility.execution" Version="$(xUnitExtensibilityExecutionPackageVersion)" />
- <PackageReference Include="xunit.runner.visualstudio" Version="$(xUnitRunnerVisualstudioPackageVersion)" />
- </ItemGroup>
-
- <ItemGroup>
- <ProjectReference Include="..\..\src\CMS.Plugin.HIAWms.EntityFrameworkCore\CMS.Plugin.HIAWms.EntityFrameworkCore.csproj" />
- <ProjectReference Include="..\..\src\CMS.Plugin.HIAWms.MySQL\CMS.Plugin.HIAWms.MySQL.csproj" />
- <ProjectReference Include="..\CMS.Plugin.HIAWms.TestBase\CMS.Plugin.HIAWms.TestBase.csproj" />
- </ItemGroup>
-
-</Project>
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/test/CMS.Plugin.HIAWms.EntityFrameworkCore.Tests/HIAWmsEntityFrameworkTestBase.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/test/CMS.Plugin.HIAWms.EntityFrameworkCore.Tests/HIAWmsEntityFrameworkTestBase.cs"
deleted file mode 100644
index 0710158..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/test/CMS.Plugin.HIAWms.EntityFrameworkCore.Tests/HIAWmsEntityFrameworkTestBase.cs"
+++ /dev/null
@@ -1,11 +0,0 @@
-using CMS.Plugin.HIAWms.TestBase;
-
-namespace CMS.Plugin.HIAWms.EntityFrameworkCore.Tests
-{
- /// <summary>
- /// MyProjectName TestBase
- /// </summary>
- public class HIAWmsEntityFrameworkTestBase : HIAWmsTestBase<HIAWmsTestEntityFrameworkCoreModule>
- {
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/test/CMS.Plugin.HIAWms.EntityFrameworkCore.Tests/HIAWmsTestEntityFrameworkCoreModule.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/test/CMS.Plugin.HIAWms.EntityFrameworkCore.Tests/HIAWmsTestEntityFrameworkCoreModule.cs"
deleted file mode 100644
index 58110e3..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/test/CMS.Plugin.HIAWms.EntityFrameworkCore.Tests/HIAWmsTestEntityFrameworkCoreModule.cs"
+++ /dev/null
@@ -1,50 +0,0 @@
-using CMS.Plugin.HIAWms.MySQL;
-using CMS.Plugin.HIAWms.TestBase;
-using Microsoft.Data.Sqlite;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Storage;
-using Volo.Abp.EntityFrameworkCore;
-using Volo.Abp.EntityFrameworkCore.Sqlite;
-using Volo.Abp.Modularity;
-
-namespace CMS.Plugin.HIAWms.EntityFrameworkCore.Tests
-{
- /// <summary>
- /// MyProjectName TestEntityFrameworkCoreModule
- /// </summary>
- [DependsOn(
- typeof(HIAWmsTestBaseModule),
- typeof(CMSPluginEntityFrameworkCoreModule),
- typeof(AbpEntityFrameworkCoreSqliteModule))]
- public class HIAWmsTestEntityFrameworkCoreModule : AbpModule
- {
- /// <summary>
- /// ConfigureServices
- /// </summary>
- /// <param name="context">ServiceConfigurationContext</param>
- public override void ConfigureServices(ServiceConfigurationContext context)
- {
- var sqliteConnection = CreateDatabaseAndGetConnection();
-
- Configure<AbpDbContextOptions>(options =>
- {
- options.Configure(dbContextConfigurationContext =>
- {
- dbContextConfigurationContext.DbContextOptions.UseSqlite(sqliteConnection);
- });
- });
- }
-
- private static SqliteConnection CreateDatabaseAndGetConnection()
- {
- var connection = new SqliteConnection("Data Source=:memory:");
- connection.Open();
-
- new CMSPluginDbContext(
- new DbContextOptionsBuilder<CMSPluginDbContext>().UseSqlite(connection).Options).GetService<IRelationalDatabaseCreator>().CreateTables();
-
- return connection;
- }
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/test/CMS.Plugin.HIAWms.TestBase/CMS.Plugin.HIAWms.TestBase.csproj" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/test/CMS.Plugin.HIAWms.TestBase/CMS.Plugin.HIAWms.TestBase.csproj"
deleted file mode 100644
index 09c6f4d..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/test/CMS.Plugin.HIAWms.TestBase/CMS.Plugin.HIAWms.TestBase.csproj"
+++ /dev/null
@@ -1,23 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
- <Import Project="../../common.test.props" />
-
- <PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
- </PropertyGroup>
-
- <ItemGroup>
- <PackageReference Include="Volo.Abp.Autofac" Version="$(ABPPackageVersion)" />
- <PackageReference Include="Volo.Abp.TestBase" Version="$(ABPPackageVersion)" />
- <PackageReference Include="Volo.Abp.Authorization" Version="$(ABPPackageVersion)" />
- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkPackageVersion)" />
- <PackageReference Include="NSubstitute" Version="$(NSubstitutePackageVersion)" />
- <PackageReference Include="Shouldly" Version="$(ShouldlyPackageVersion)" />
- <PackageReference Include="xunit" Version="$(xUnitPackageVersion)" />
- <PackageReference Include="xunit.extensibility.execution" Version="$(xUnitExtensibilityExecutionPackageVersion)" />
- <PackageReference Include="xunit.runner.visualstudio" Version="$(xUnitRunnerVisualstudioPackageVersion)" />
- </ItemGroup>
-
- <ItemGroup>
- <ProjectReference Include="..\..\src\CMS.Plugin.HIAWms.Domain\CMS.Plugin.HIAWms.Domain.csproj" />
- </ItemGroup>
-</Project>
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/test/CMS.Plugin.HIAWms.TestBase/HIAWmsDataSeedContributor.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/test/CMS.Plugin.HIAWms.TestBase/HIAWmsDataSeedContributor.cs"
deleted file mode 100644
index ee1e764..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/test/CMS.Plugin.HIAWms.TestBase/HIAWmsDataSeedContributor.cs"
+++ /dev/null
@@ -1,35 +0,0 @@
-using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp.Data;
-using Volo.Abp.DependencyInjection;
-using Volo.Abp.Guids;
-
-namespace CMS.Plugin.HIAWms.TestBase
-{
- /// <summary>
- /// MyProjectName DataSeedContributor
- /// </summary>
- public class HIAWmsDataSeedContributor : IDataSeedContributor, ITransientDependency
- {
- private readonly HIAWmsTestData _myProjectNameTestData;
- private readonly IGuidGenerator _guidGenerator;
- /// <summary>
- /// Initializes a new instance of the <see cref="HIAWmsDataSeedContributor"/> class.
- /// </summary>
- /// <param name="serviceProvider">IServiceProvider</param>
- public HIAWmsDataSeedContributor(IServiceProvider serviceProvider)
- {
- _myProjectNameTestData = serviceProvider.GetRequiredService<HIAWmsTestData>();
- _guidGenerator = serviceProvider.GetRequiredService<IGuidGenerator>();
- }
-
- /// <summary>
- /// SeedAsync
- /// </summary>
- /// <param name="context">DataSeedContext</param>
- /// <returns>Task</returns>
- public async Task SeedAsync(DataSeedContext context)
- {
- await Task.CompletedTask;
- }
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/test/CMS.Plugin.HIAWms.TestBase/HIAWmsTestBase.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/test/CMS.Plugin.HIAWms.TestBase/HIAWmsTestBase.cs"
deleted file mode 100644
index 5c3b85e..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/test/CMS.Plugin.HIAWms.TestBase/HIAWmsTestBase.cs"
+++ /dev/null
@@ -1,89 +0,0 @@
-using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp;
-using Volo.Abp.Modularity;
-using Volo.Abp.Testing;
-using Volo.Abp.Uow;
-
-namespace CMS.Plugin.HIAWms.TestBase
-{
- /// <summary>
- /// MyProjectName TestBase
- /// </summary>
- /// <typeparam name="TStartupModule">IAbpModule</typeparam>
- public class HIAWmsTestBase<TStartupModule> : AbpIntegratedTest<TStartupModule>
- where TStartupModule : IAbpModule
- {
- /// <summary>
- /// SetAbpApplicationCreationOptions
- /// </summary>
- /// <param name="options">AbpApplicationCreationOptions</param>
- protected override void SetAbpApplicationCreationOptions(AbpApplicationCreationOptions options)
- {
- options.UseAutofac();
- }
-
- /// <summary>
- /// WithUnitOfWorkAsync
- /// </summary>
- /// <param name="func">func</param>
- /// <returns>Task</returns>
- protected virtual Task WithUnitOfWorkAsync(Func<Task> func)
- {
- return WithUnitOfWorkAsync(new AbpUnitOfWorkOptions(), func);
- }
-
- /// <summary>
- /// WithUnitOfWorkAsync
- /// </summary>
- /// <param name="options">AbpUnitOfWorkOptions</param>
- /// <param name="action">action</param>
- /// <returns>Task</returns>
- protected virtual async Task WithUnitOfWorkAsync(AbpUnitOfWorkOptions options, Func<Task> action)
- {
- using (var scope = ServiceProvider.CreateScope())
- {
- var uowManager = scope.ServiceProvider.GetRequiredService<IUnitOfWorkManager>();
-
- using (var uow = uowManager.Begin(options))
- {
- await action();
-
- await uow.CompleteAsync();
- }
- }
- }
-
- /// <summary>
- /// WithUnitOfWorkAsync
- /// </summary>
- /// <typeparam name="TResult">t</typeparam>
- /// <param name="func">TResult</param>
- /// <returns>TResult</returns>
- protected virtual Task<TResult> WithUnitOfWorkAsync<TResult>(Func<Task<TResult>> func)
- {
- return WithUnitOfWorkAsync(new AbpUnitOfWorkOptions(), func);
- }
-
- /// <summary>
- /// WithUnitOfWorkAsync
- /// </summary>
- /// <typeparam name="TResult">T</typeparam>
- /// <param name="options">AbpUnitOfWorkOptions</param>
- /// <param name="func">Func</param>
- /// <returns>TResult</returns>
- protected virtual async Task<TResult> WithUnitOfWorkAsync<TResult>(AbpUnitOfWorkOptions options, Func<Task<TResult>> func)
- {
- using (var scope = ServiceProvider.CreateScope())
- {
- var uowManager = scope.ServiceProvider.GetRequiredService<IUnitOfWorkManager>();
-
- using (var uow = uowManager.Begin(options))
- {
- var result = await func();
- await uow.CompleteAsync();
- return result;
- }
- }
- }
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/test/CMS.Plugin.HIAWms.TestBase/HIAWmsTestBaseModule.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/test/CMS.Plugin.HIAWms.TestBase/HIAWmsTestBaseModule.cs"
deleted file mode 100644
index 1668a69..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/test/CMS.Plugin.HIAWms.TestBase/HIAWmsTestBaseModule.cs"
+++ /dev/null
@@ -1,63 +0,0 @@
-using CMS.Plugin.HIAWms.Domain;
-using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp;
-using Volo.Abp.Autofac;
-using Volo.Abp.Data;
-using Volo.Abp.Modularity;
-using Volo.Abp.Threading;
-using Volo.Abp.Uow;
-
-namespace CMS.Plugin.HIAWms.TestBase
-{
- /// <summary>
- /// MyProjectName TestBaseModule
- /// </summary>
- [DependsOn(
- typeof(AbpAutofacModule),
- typeof(AbpTestBaseModule),
- typeof(CMSPluginDomainModule))]
- public class HIAWmsTestBaseModule : AbpModule
- {
- /// <summary>
- /// PreConfigureServices
- /// </summary>
- /// <param name="context">ServiceConfigurationContext</param>
- public override void PreConfigureServices(ServiceConfigurationContext context)
- {
- }
-
- /// <summary>
- /// ConfigureServices
- /// </summary>
- /// <param name="context">ServiceConfigurationContext</param>
- public override void ConfigureServices(ServiceConfigurationContext context)
- {
- context.Services.AddAlwaysAllowAuthorization();
- Configure<AbpUnitOfWorkDefaultOptions>(options =>
- {
- options.TransactionBehavior = UnitOfWorkTransactionBehavior.Enabled;
- });
- }
-
- /// <summary>
- /// OnApplicationInitialization
- /// </summary>
- /// <param name="context">ApplicationInitializationContext</param>
- public override void OnApplicationInitialization(ApplicationInitializationContext context)
- {
- SeedTestData(context);
- }
-
- private static void SeedTestData(ApplicationInitializationContext context)
- {
- AsyncHelper.RunSync(async () =>
- {
- using (var scope = context.ServiceProvider.CreateScope())
- {
- var dataSeeder = scope.ServiceProvider.GetRequiredService<IDataSeeder>();
- await dataSeeder.SeedAsync();
- }
- });
- }
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/test/CMS.Plugin.HIAWms.TestBase/HIAWmsTestData.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/test/CMS.Plugin.HIAWms.TestBase/HIAWmsTestData.cs"
deleted file mode 100644
index 1aaaf18..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/test/CMS.Plugin.HIAWms.TestBase/HIAWmsTestData.cs"
+++ /dev/null
@@ -1,8 +0,0 @@
-using Volo.Abp.DependencyInjection;
-
-namespace CMS.Plugin.HIAWms.TestBase
-{
- public class HIAWmsTestData : ISingletonDependency
- {
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/build-server.ps1" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/build-server.ps1"
new file mode 100644
index 0000000..b9ae55c
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/build-server.ps1"
@@ -0,0 +1,18 @@
+# Paths
+$rootFolder = (Get-Item -Path "./" -Verbose).FullName
+
+$serverFolder = Join-Path $rootFolder ("/server")
+
+Set-Location $serverFolder
+& dotnet tool install --global dotnet-ef
+
+& dotnet restore -s https://nexus.sycdev.com/repository/nuget-group/index.json
+
+$migrationFolder = Join-Path $serverFolder ("/src/CMS.Plugin.WareCmsUtilityApi.MySQL")
+Set-Location $migrationFolder
+dotnet ef migrations add InitialCreate -c CMSPluginDbContext -o Migrations
+
+Set-Location $serverFolder
+& dotnet build
+
+Set-Location $rootFolder
\ No newline at end of file
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/build-web.ps1" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/build-web.ps1"
new file mode 100644
index 0000000..6094355
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/build-web.ps1"
@@ -0,0 +1,16 @@
+# Paths
+$rootFolder = (Get-Item -Path "./" -Verbose).FullName
+
+$webFolder = Join-Path $rootFolder ("/web")
+
+Set-Location $rootFolder
+& npm install yarn -g
+& npm install lmes-cli -g
+
+& lmes-cli create web
+
+Set-Location $webFolder
+& yarn
+& npm run build
+
+Set-Location $rootFolder
\ No newline at end of file
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/.idea/.idea.CMS.Plugin.HIAWms/.idea/encodings.xml" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/.idea/.idea.CMS.Plugin.WareCmsUtilityApi/.idea/encodings.xml"
similarity index 100%
rename from "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/.idea/.idea.CMS.Plugin.HIAWms/.idea/encodings.xml"
rename to "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/.idea/.idea.CMS.Plugin.WareCmsUtilityApi/.idea/encodings.xml"
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/.idea/.idea.CMS.Plugin.HIAWms/.idea/indexLayout.xml" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/.idea/.idea.CMS.Plugin.WareCmsUtilityApi/.idea/indexLayout.xml"
similarity index 100%
rename from "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/.idea/.idea.CMS.Plugin.HIAWms/.idea/indexLayout.xml"
rename to "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/.idea/.idea.CMS.Plugin.WareCmsUtilityApi/.idea/indexLayout.xml"
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/.idea/.idea.CMS.Plugin.HIAWms/.idea/vcs.xml" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/.idea/.idea.CMS.Plugin.WareCmsUtilityApi/.idea/vcs.xml"
similarity index 100%
rename from "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/.idea/.idea.CMS.Plugin.HIAWms/.idea/vcs.xml"
rename to "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/.idea/.idea.CMS.Plugin.WareCmsUtilityApi/.idea/vcs.xml"
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/CMS.Plugin.WareCmsUtilityApi.sln" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/CMS.Plugin.WareCmsUtilityApi.sln"
new file mode 100644
index 0000000..66d338d
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/CMS.Plugin.WareCmsUtilityApi.sln"
@@ -0,0 +1,144 @@
+锘�
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.4.33110.190
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "瑙ｅ喅鏂规椤�", "瑙ｅ喅鏂规椤�", "{28C418E6-AF1D-4B74-ACDF-7B81FA4C256E}"
+ ProjectSection(SolutionItems) = preProject
+ .editorconfig = .editorconfig
+ .gitignore = .gitignore
+ common.props = common.props
+ common.test.props = common.test.props
+ configureawait.props = configureawait.props
+ delete-bin-obj-folders.bat = delete-bin-obj-folders.bat
+ Directory.Build.props = Directory.Build.props
+ NuGet.config = NuGet.config
+ package.reference.props = package.reference.props
+ publish.ps1 = publish.ps1
+ README.md = README.md
+ stylecop.json = stylecop.json
+ EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{19F68F40-2A05-48EB-86F0-56928B3CCE9C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{5632E2B3-5592-4C6A-9493-768E5B04804D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CMS.Plugin.WareCmsUtilityApi", "src\CMS.Plugin.WareCmsUtilityApi\CMS.Plugin.WareCmsUtilityApi.csproj", "{9926DE4C-376D-487E-9C64-494913D94379}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore", "src\CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore\CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore.csproj", "{0022A80F-6D52-4B58-B2B3-F029DB4AEC0A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CMS.Plugin.WareCmsUtilityApi.Domain", "src\CMS.Plugin.WareCmsUtilityApi.Domain\CMS.Plugin.WareCmsUtilityApi.Domain.csproj", "{8B2BED13-2B0E-49B5-8B0A-F272D27B2F37}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CMS.Plugin.WareCmsUtilityApi.Domain.Shared", "src\CMS.Plugin.WareCmsUtilityApi.Domain.Shared\CMS.Plugin.WareCmsUtilityApi.Domain.Shared.csproj", "{F405C633-8100-49B8-A270-D5340A165742}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CMS.Plugin.WareCmsUtilityApi.Application.Contracts", "src\CMS.Plugin.WareCmsUtilityApi.Application.Contracts\CMS.Plugin.WareCmsUtilityApi.Application.Contracts.csproj", "{D65BB57E-618A-468C-AA28-BD8C9EBF0AF2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CMS.Plugin.WareCmsUtilityApi.Application", "src\CMS.Plugin.WareCmsUtilityApi.Application\CMS.Plugin.WareCmsUtilityApi.Application.csproj", "{02CB86F3-E614-4193-8B7F-C2FB665C8A5A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "doc", "doc", "{A68B3B6B-DDE8-431E-90F3-A9FEE1D14A53}"
+ ProjectSection(SolutionItems) = preProject
+ doc\Domain-Drive-Design.md = doc\Domain-Drive-Design.md
+ EndProjectSection
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CMS.Plugin.WareCmsUtilityApi.TestBase", "test\CMS.Plugin.WareCmsUtilityApi.TestBase\CMS.Plugin.WareCmsUtilityApi.TestBase.csproj", "{33999EE8-73A1-4CF2-BDFD-CE353B05A727}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore.Tests", "test\CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore.Tests\CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore.Tests.csproj", "{C6AFC427-C51D-4BD2-BBA6-8841D3495077}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CMS.Plugin.WareCmsUtilityApi.Domain.Tests", "test\CMS.Plugin.WareCmsUtilityApi.Domain.Tests\CMS.Plugin.WareCmsUtilityApi.Domain.Tests.csproj", "{74E86B03-F185-47B2-A4C3-04C1CEC84F14}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CMS.Plugin.WareCmsUtilityApi.Application.Tests", "test\CMS.Plugin.WareCmsUtilityApi.Application.Tests\CMS.Plugin.WareCmsUtilityApi.Application.Tests.csproj", "{731DE36F-27F5-48B8-865D-DA43C8910010}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CMS.Plugin.WareCmsUtilityApi.Abstractions", "src\CMS.Plugin.WareCmsUtilityApi.Abstractions\CMS.Plugin.WareCmsUtilityApi.Abstractions.csproj", "{87D957E4-FE12-4432-9B7B-827A98DD41D1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CMS.Plugin.WareCmsUtilityApi.MySQL", "src\CMS.Plugin.WareCmsUtilityApi.MySQL\CMS.Plugin.WareCmsUtilityApi.MySQL.csproj", "{2F71D6DF-F19A-410C-BD79-F2F871E63902}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CMS.Plugin.WareCmsUtilityApi.PostgreSql", "src\CMS.Plugin.WareCmsUtilityApi.PostgreSql\CMS.Plugin.WareCmsUtilityApi.PostgreSql.csproj", "{698D9FFA-080C-4F22-9FBF-B9509B28A954}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CMS.Plugin.WareCmsUtilityApi.SqlServer", "src\CMS.Plugin.WareCmsUtilityApi.SqlServer\CMS.Plugin.WareCmsUtilityApi.SqlServer.csproj", "{521D17FF-BD3A-43B4-9BEE-183FDE3522F4}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Release|Any CPU = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {9926DE4C-376D-487E-9C64-494913D94379}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {9926DE4C-376D-487E-9C64-494913D94379}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {9926DE4C-376D-487E-9C64-494913D94379}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {9926DE4C-376D-487E-9C64-494913D94379}.Release|Any CPU.Build.0 = Release|Any CPU
+ {0022A80F-6D52-4B58-B2B3-F029DB4AEC0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {0022A80F-6D52-4B58-B2B3-F029DB4AEC0A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {0022A80F-6D52-4B58-B2B3-F029DB4AEC0A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {0022A80F-6D52-4B58-B2B3-F029DB4AEC0A}.Release|Any CPU.Build.0 = Release|Any CPU
+ {8B2BED13-2B0E-49B5-8B0A-F272D27B2F37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {8B2BED13-2B0E-49B5-8B0A-F272D27B2F37}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {8B2BED13-2B0E-49B5-8B0A-F272D27B2F37}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {8B2BED13-2B0E-49B5-8B0A-F272D27B2F37}.Release|Any CPU.Build.0 = Release|Any CPU
+ {F405C633-8100-49B8-A270-D5340A165742}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {F405C633-8100-49B8-A270-D5340A165742}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {F405C633-8100-49B8-A270-D5340A165742}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {F405C633-8100-49B8-A270-D5340A165742}.Release|Any CPU.Build.0 = Release|Any CPU
+ {D65BB57E-618A-468C-AA28-BD8C9EBF0AF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {D65BB57E-618A-468C-AA28-BD8C9EBF0AF2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {D65BB57E-618A-468C-AA28-BD8C9EBF0AF2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {D65BB57E-618A-468C-AA28-BD8C9EBF0AF2}.Release|Any CPU.Build.0 = Release|Any CPU
+ {02CB86F3-E614-4193-8B7F-C2FB665C8A5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {02CB86F3-E614-4193-8B7F-C2FB665C8A5A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {02CB86F3-E614-4193-8B7F-C2FB665C8A5A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {02CB86F3-E614-4193-8B7F-C2FB665C8A5A}.Release|Any CPU.Build.0 = Release|Any CPU
+ {33999EE8-73A1-4CF2-BDFD-CE353B05A727}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {33999EE8-73A1-4CF2-BDFD-CE353B05A727}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {33999EE8-73A1-4CF2-BDFD-CE353B05A727}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {33999EE8-73A1-4CF2-BDFD-CE353B05A727}.Release|Any CPU.Build.0 = Release|Any CPU
+ {C6AFC427-C51D-4BD2-BBA6-8841D3495077}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {C6AFC427-C51D-4BD2-BBA6-8841D3495077}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {C6AFC427-C51D-4BD2-BBA6-8841D3495077}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {C6AFC427-C51D-4BD2-BBA6-8841D3495077}.Release|Any CPU.Build.0 = Release|Any CPU
+ {74E86B03-F185-47B2-A4C3-04C1CEC84F14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {74E86B03-F185-47B2-A4C3-04C1CEC84F14}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {74E86B03-F185-47B2-A4C3-04C1CEC84F14}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {74E86B03-F185-47B2-A4C3-04C1CEC84F14}.Release|Any CPU.Build.0 = Release|Any CPU
+ {731DE36F-27F5-48B8-865D-DA43C8910010}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {731DE36F-27F5-48B8-865D-DA43C8910010}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {731DE36F-27F5-48B8-865D-DA43C8910010}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {731DE36F-27F5-48B8-865D-DA43C8910010}.Release|Any CPU.Build.0 = Release|Any CPU
+ {87D957E4-FE12-4432-9B7B-827A98DD41D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {87D957E4-FE12-4432-9B7B-827A98DD41D1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {87D957E4-FE12-4432-9B7B-827A98DD41D1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {87D957E4-FE12-4432-9B7B-827A98DD41D1}.Release|Any CPU.Build.0 = Release|Any CPU
+ {2F71D6DF-F19A-410C-BD79-F2F871E63902}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {2F71D6DF-F19A-410C-BD79-F2F871E63902}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {2F71D6DF-F19A-410C-BD79-F2F871E63902}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {2F71D6DF-F19A-410C-BD79-F2F871E63902}.Release|Any CPU.Build.0 = Release|Any CPU
+ {698D9FFA-080C-4F22-9FBF-B9509B28A954}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {698D9FFA-080C-4F22-9FBF-B9509B28A954}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {698D9FFA-080C-4F22-9FBF-B9509B28A954}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {698D9FFA-080C-4F22-9FBF-B9509B28A954}.Release|Any CPU.Build.0 = Release|Any CPU
+ {521D17FF-BD3A-43B4-9BEE-183FDE3522F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {521D17FF-BD3A-43B4-9BEE-183FDE3522F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {521D17FF-BD3A-43B4-9BEE-183FDE3522F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {521D17FF-BD3A-43B4-9BEE-183FDE3522F4}.Release|Any CPU.Build.0 = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+ GlobalSection(NestedProjects) = preSolution
+ {9926DE4C-376D-487E-9C64-494913D94379} = {19F68F40-2A05-48EB-86F0-56928B3CCE9C}
+ {0022A80F-6D52-4B58-B2B3-F029DB4AEC0A} = {19F68F40-2A05-48EB-86F0-56928B3CCE9C}
+ {8B2BED13-2B0E-49B5-8B0A-F272D27B2F37} = {19F68F40-2A05-48EB-86F0-56928B3CCE9C}
+ {F405C633-8100-49B8-A270-D5340A165742} = {19F68F40-2A05-48EB-86F0-56928B3CCE9C}
+ {D65BB57E-618A-468C-AA28-BD8C9EBF0AF2} = {19F68F40-2A05-48EB-86F0-56928B3CCE9C}
+ {02CB86F3-E614-4193-8B7F-C2FB665C8A5A} = {19F68F40-2A05-48EB-86F0-56928B3CCE9C}
+ {33999EE8-73A1-4CF2-BDFD-CE353B05A727} = {5632E2B3-5592-4C6A-9493-768E5B04804D}
+ {C6AFC427-C51D-4BD2-BBA6-8841D3495077} = {5632E2B3-5592-4C6A-9493-768E5B04804D}
+ {74E86B03-F185-47B2-A4C3-04C1CEC84F14} = {5632E2B3-5592-4C6A-9493-768E5B04804D}
+ {731DE36F-27F5-48B8-865D-DA43C8910010} = {5632E2B3-5592-4C6A-9493-768E5B04804D}
+ {87D957E4-FE12-4432-9B7B-827A98DD41D1} = {19F68F40-2A05-48EB-86F0-56928B3CCE9C}
+ {2F71D6DF-F19A-410C-BD79-F2F871E63902} = {19F68F40-2A05-48EB-86F0-56928B3CCE9C}
+ {698D9FFA-080C-4F22-9FBF-B9509B28A954} = {19F68F40-2A05-48EB-86F0-56928B3CCE9C}
+ {521D17FF-BD3A-43B4-9BEE-183FDE3522F4} = {19F68F40-2A05-48EB-86F0-56928B3CCE9C}
+ EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {220123E7-A888-4DE7-8F9A-8FE271543889}
+ EndGlobalSection
+EndGlobal
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/Directory.Build.props" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/Directory.Build.props"
similarity index 100%
rename from "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/Directory.Build.props"
rename to "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/Directory.Build.props"
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/NuGet.config" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/NuGet.config"
similarity index 100%
rename from "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/NuGet.config"
rename to "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/NuGet.config"
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/README.md" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/README.md"
new file mode 100644
index 0000000..800683e
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/README.md"
@@ -0,0 +1,2 @@
+# WareCmsUtilityApi
+
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/common.props" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/common.props"
similarity index 100%
rename from "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/common.props"
rename to "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/common.props"
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/common.test.props" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/common.test.props"
similarity index 100%
rename from "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/common.test.props"
rename to "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/common.test.props"
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/configureawait.props" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/configureawait.props"
similarity index 100%
rename from "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/configureawait.props"
rename to "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/configureawait.props"
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/delete-bin-obj-folders.bat" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/delete-bin-obj-folders.bat"
similarity index 100%
rename from "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/delete-bin-obj-folders.bat"
rename to "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/delete-bin-obj-folders.bat"
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/doc/Domain-Drive-Design.md" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/doc/Domain-Drive-Design.md"
similarity index 100%
rename from "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/doc/Domain-Drive-Design.md"
rename to "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/doc/Domain-Drive-Design.md"
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/package.reference.props" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/package.reference.props"
similarity index 100%
rename from "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/package.reference.props"
rename to "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/package.reference.props"
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/publish.ps1" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/publish.ps1"
new file mode 100644
index 0000000..2e2f137
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/publish.ps1"
@@ -0,0 +1,38 @@
+# publishFolder
+$publishFolder= $args[0]
+
+# Paths
+$rootFolder = (Get-Item -Path "./" -Verbose).FullName
+if ([String]::IsNullOrEmpty($publishFolder)) {
+ $publishFolder = Join-Path $rootFolder "output/publish"
+ $hasPath = Test-Path($publishFolder)
+ if (-Not $hasPath) {
+ new-item -path $rootFolder -name "output/publish" -type directory
+ }
+}
+Write-Host ("Publish Output " + $publishFolder)
+
+# List of projects
+$projects = (
+ "src/CMS.Plugin.WareCmsUtilityApi"
+)
+
+# Rebuild solution
+Set-Location $rootFolder
+dotnet restore -s https://nexus.sycdev.com/repository/nuget-hosted/ --runtime win-x64
+# dotnet restore --configfile NuGet.config --runtime win-x64
+Write-Host ("Restore Completed ! ")
+# Publish all projects
+foreach($project in $projects) {
+ $projectFolder = Join-Path $rootFolder $project
+ $projectName = $project.Substring($project.LastIndexOf("/") + 1)
+ Set-Location $projectFolder
+ Write-Host ("Publish " + $projectName)
+ # & dotnet publish ($projectName + ".csproj ") --configuration Release --output (Join-Path $publishFolder ("/" + $projectName.ToLower())) --nologo --verbosity quiet --no-restore
+ & dotnet publish ($projectName + ".csproj ") --configuration Release --output (Join-Path $publishFolder ("/" + $projectName.ToLower())) --nologo --verbosity quiet --no-restore --runtime win-x64
+}
+
+Write-Host ("Publish Completed ! ")
+
+# Go back to the root folder
+Set-Location $rootFolder
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Abstractions/CMS.Plugin.HIAWms.Abstractions.csproj" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Abstractions/CMS.Plugin.WareCmsUtilityApi.Abstractions.csproj"
similarity index 100%
rename from "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Abstractions/CMS.Plugin.HIAWms.Abstractions.csproj"
rename to "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Abstractions/CMS.Plugin.WareCmsUtilityApi.Abstractions.csproj"
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Abstractions/CMSPluginWareCmsUtilityApiAbstractionsModule.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Abstractions/CMSPluginWareCmsUtilityApiAbstractionsModule.cs"
new file mode 100644
index 0000000..bd1b9b2
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Abstractions/CMSPluginWareCmsUtilityApiAbstractionsModule.cs"
@@ -0,0 +1,8 @@
+namespace CMS.Plugin.WareCmsUtilityApi.Abstractions;
+
+/// <summary>
+/// 娴佺▼涓氬姟鎵╁睍妯″潡
+/// </summary>
+public class CMSPluginWareCmsUtilityApiAbstractionsModule
+{
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Abstractions/CMSPluginWareCmsUtilityApiExtensions.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Abstractions/CMSPluginWareCmsUtilityApiExtensions.cs"
new file mode 100644
index 0000000..f025ed9
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Abstractions/CMSPluginWareCmsUtilityApiExtensions.cs"
@@ -0,0 +1,30 @@
+using Microsoft.Extensions.DependencyInjection;
+
+namespace CMS.Plugin.WareCmsUtilityApi.Abstractions
+{
+ /// <summary>
+ /// 鎵╁睍鏂规硶
+ /// </summary>
+ public static class CMSPluginWareCmsUtilityApiExtensions
+ {
+ /// <summary>
+ /// Tries the add setting management.
+ /// </summary>
+ /// <param name="services">The services.</param>
+ /// <param name="configureOptions">The configure options.</param>
+ /// <returns></returns>
+ public static IServiceCollection TryAddWareCmsUtilityApi(this IServiceCollection services, Action<CMSPluginWareCmsUtilityApiOptions>? configureOptions = null)
+ {
+ if (configureOptions == null)
+ {
+ services.AddOptions().Configure<CMSPluginWareCmsUtilityApiOptions>(options => {});
+ }
+ else
+ {
+ services.AddOptions().PostConfigure(configureOptions);
+ }
+
+ return services;
+ }
+ }
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Abstractions/CMSPluginWareCmsUtilityApiFeatures.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Abstractions/CMSPluginWareCmsUtilityApiFeatures.cs"
new file mode 100644
index 0000000..d8e8e99
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Abstractions/CMSPluginWareCmsUtilityApiFeatures.cs"
@@ -0,0 +1,23 @@
+namespace CMS.Plugin.WareCmsUtilityApi.Abstractions
+{
+ /// <summary>
+ /// 鍔熻兘瀹氫箟.
+ /// </summary>
+ public class CMSPluginWareCmsUtilityApiFeatures
+ {
+ /// <summary>
+ /// The prefix
+ /// </summary>
+ private const string Prefix = "LMES";
+
+ /// <summary>
+ /// GroupName
+ /// </summary>
+ public const string GroupName = Prefix + ".WareCmsUtilityApi";
+
+ /// <summary>
+ /// 鏄惁寮�鍚�
+ /// </summary>
+ public const string Enable = GroupName + ".Enable";
+ }
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Abstractions/CMSPluginWareCmsUtilityApiOptions.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Abstractions/CMSPluginWareCmsUtilityApiOptions.cs"
new file mode 100644
index 0000000..eeb98bb
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Abstractions/CMSPluginWareCmsUtilityApiOptions.cs"
@@ -0,0 +1,16 @@
+using CMS.Plugin.MesSuite.Abstractions.Models;
+
+namespace CMS.Plugin.WareCmsUtilityApi.Abstractions
+{
+ public class CMSPluginWareCmsUtilityApiOptions
+ {
+ public CMSPluginWareCmsUtilityApiOptions()
+ {
+ }
+
+ /// <summary>
+ /// 鎵╁睍灞炴��
+ /// </summary>
+ public List<ExtraProperty> ExtraProperties { get; set; } = new();
+ }
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Abstractions/CMSPluginWareCmsUtilityApiSettings.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Abstractions/CMSPluginWareCmsUtilityApiSettings.cs"
new file mode 100644
index 0000000..a271b3d
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Abstractions/CMSPluginWareCmsUtilityApiSettings.cs"
@@ -0,0 +1,23 @@
+namespace CMS.Plugin.WareCmsUtilityApi.Abstractions
+{
+ /// <summary>
+ /// CMSSettingNames
+ /// </summary>
+ public static class CMSPluginWareCmsUtilityApiSettings
+ {
+ /// <summary>
+ /// The prefix
+ /// </summary>
+ private const string Prefix = "SCMS";
+
+ /// <summary>
+ /// The application settings prefix
+ /// </summary>
+ private const string AppSettingsPrefix = Prefix + ".AppSettings";
+
+ /// <summary>
+ /// 缁勪欢鐘舵�侊細0=鍏抽棴,1=寮�鍚�
+ /// </summary>
+ public const string PluginState = AppSettingsPrefix + ".WareCmsUtilityApi.PluginState";
+ }
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Abstractions/FodyWeavers.xml" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Abstractions/FodyWeavers.xml"
similarity index 100%
rename from "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Abstractions/FodyWeavers.xml"
rename to "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Abstractions/FodyWeavers.xml"
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Abstractions/IWareCmsUtilityApiFlowService.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Abstractions/IWareCmsUtilityApiFlowService.cs"
new file mode 100644
index 0000000..62dfc37
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Abstractions/IWareCmsUtilityApiFlowService.cs"
@@ -0,0 +1,15 @@
+using SYC.Flow.Kernel;
+
+namespace CMS.Plugin.WareCmsUtilityApi.Abstractions
+{
+ /// <summary>
+ /// WareCmsUtilityApi 娴佺▼鏈嶅姟
+ /// </summary>
+ public interface IWareCmsUtilityApiFlowService
+ {
+ /// <summary>
+ /// 宸ヨ壓娴佺▼澶勭悊
+ /// </summary>
+ Task ProcessAsync(ProcessflowEventArgs args);
+ }
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Abstractions/Properties/AssemblyInfo.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Abstractions/Properties/AssemblyInfo.cs"
similarity index 100%
rename from "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Abstractions/Properties/AssemblyInfo.cs"
rename to "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Abstractions/Properties/AssemblyInfo.cs"
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Abstractions/WareCmsUtilityApiActivity.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Abstractions/WareCmsUtilityApiActivity.cs"
new file mode 100644
index 0000000..a9502c0
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Abstractions/WareCmsUtilityApiActivity.cs"
@@ -0,0 +1,78 @@
+using System.ComponentModel;
+using System.Runtime.Serialization;
+using CMS.Plugin.FlowManagement.Abstractions.Enums;
+using CMS.Plugin.FlowManagement.Abstractions.FlowBusiness.Activitys;
+using CMS.Plugin.MesSuite.Abstractions.Models;
+using CMS.Plugin.OrderManagement.Abstractions.Models;
+using CMS.Plugin.ProcessManagement.Abstractions.Models;
+using CMS.Plugin.TraceManagement.Abstractions.Models.Traces;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using SYC.Flow.Kernel;
+
+namespace CMS.Plugin.WareCmsUtilityApi.Abstractions
+{
+ /// <summary>
+ /// WareCmsUtilityApi 涓氬姟姝ラ
+ /// </summary>
+ [Design("WareCmsUtilityApi", "WareCmsUtilityApi 涓氬姟姝ラ", Sort = 99), Category("瀹氬埗姝ラ")]
+ [Serializable]
+ public class WareCmsUtilityApiActivity : BusinessActivity
+ {
+ /// <summary>
+ /// 閰嶇疆灞炴��1
+ /// </summary>
+ [Design("閰嶇疆灞炴��1", "閰嶇疆灞炴��1", Sort = 1), Category("閰嶇疆淇℃伅")]
+ [DataMember]
+ public string MyProperty1 { get; set; }
+
+ /// <summary>
+ /// 閰嶇疆灞炴��2
+ /// </summary>
+ [Design("閰嶇疆灞炴��2", "閰嶇疆灞炴��2", Sort = 2), Category("閰嶇疆淇℃伅")]
+ [DataMember]
+ public int MyProperty2 { get; set; }
+
+ /// <summary>
+ /// 娴佺▼涓婁笅鏂囨爣璇嗛泦鍚�
+ /// </summary>
+ public override List<FlowItemKey> FlowItemKeys => GetFlowItemKeys();
+
+ /// <summary>
+ /// 宸ヨ壓娴佺▼澶勭悊
+ /// </summary>
+ public override async Task ProcessAsync(ProcessflowEventArgs args)
+ {
+ // 宸ヨ壓妯″瀷
+ var processModel = Flow.DataItems.ApplicationData as ProcessModel;
+
+ // 宸ュ崟妯″瀷
+ var orderModel = Flow.DataItems[FlowItemCollection.OrderModel] as OrderModel;
+
+ // 浜у搧妯″瀷
+ var productModel = Flow.DataItems[FlowItemCollection.ProductModel] as AssociationProductModel;
+
+ // 杩芥函妯″瀷
+ var traceModel = Flow.DataItems[FlowItemCollection.TraceModel] as TraceModel;
+
+ Flow.Logger.LogInformation($"鎵ц娴佺▼锛氬疄渚�={Flow.Instance.ProcID} -> {Flow.Name} -> {Name} WareCmsUtilityApiActivity");
+
+ // 涓氬姟澶勭悊
+ // 鐢变簬ServiceProvider鏉ユ簮浜嶧low缁勪欢锛屾澶勯渶鍏变韩CMS.Plugin.WareCmsUtilityApi.Abstractions绋嬪簭闆嗭紝鍚﹀垯鏃犳硶璋冪敤锛屼慨鏀笴MS.Plugin.WareCmsUtilityApi椤圭洰涓殑CMSPluginModule.cs鏂囦欢锛屽彇娑堟敞閲奊etSharedAssemblies()鏂规硶
+ var warecmsutilityapiFlowService = Flow.ServiceProvider.GetService<IWareCmsUtilityApiFlowService>();
+ if (warecmsutilityapiFlowService != null)
+ {
+ await warecmsutilityapiFlowService.ProcessAsync(args);
+ }
+ }
+
+ /// <summary>
+ /// Gets the flow item keys.
+ /// </summary>
+ protected virtual List<FlowItemKey> GetFlowItemKeys()
+ {
+ var result = new List<FlowItemKey>();
+ return result;
+ }
+ }
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application.Contracts/CMS.Plugin.WareCmsUtilityApi.Application.Contracts.csproj" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application.Contracts/CMS.Plugin.WareCmsUtilityApi.Application.Contracts.csproj"
new file mode 100644
index 0000000..982d875
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application.Contracts/CMS.Plugin.WareCmsUtilityApi.Application.Contracts.csproj"
@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+ <Import Project="../../common.props" />
+ <Import Project="../../configureawait.props" />
+
+ <PropertyGroup>
+ <TargetFramework>net6.0</TargetFramework>
+ <GenerateDocumentationFile>True</GenerateDocumentationFile>
+ </PropertyGroup>
+
+ <ItemGroup>
+ <PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="$(ABPPackageVersion)" />
+ <PackageReference Include="Volo.Abp.Authorization.Abstractions" Version="$(ABPPackageVersion)" />
+ <PackageReference Include="MiniExcel" Version="1.31.3" />
+ </ItemGroup>
+
+ <ItemGroup>
+ <ProjectReference Include="..\CMS.Plugin.WareCmsUtilityApi.Domain.Shared\CMS.Plugin.WareCmsUtilityApi.Domain.Shared.csproj" />
+ </ItemGroup>
+
+</Project>
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application.Contracts/CMSPluginApplicationContractsModule.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application.Contracts/CMSPluginApplicationContractsModule.cs"
new file mode 100644
index 0000000..08f6b1b
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application.Contracts/CMSPluginApplicationContractsModule.cs"
@@ -0,0 +1,21 @@
+using CMS.Plugin.WareCmsUtilityApi.Domain.Shared;
+using Volo.Abp.Application;
+using Volo.Abp.Modularity;
+
+namespace CMS.Plugin.WareCmsUtilityApi.Application.Contracts;
+
+/// <summary>
+/// 鎻掍欢搴旂敤鏈嶅姟濂戠害妯″潡
+/// </summary>
+[DependsOn(
+ typeof(CMSPluginDomainSharedModule),
+ typeof(AbpDddApplicationContractsModule)
+)]
+public class CMSPluginApplicationContractsModule : AbpModule
+{
+ /// <inheritdoc />
+ public override void PreConfigureServices(ServiceConfigurationContext context)
+ {
+ CMSPluginDtoExtensions.Configure();
+ }
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application.Contracts/CMSPluginDtoExtensions.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application.Contracts/CMSPluginDtoExtensions.cs"
new file mode 100644
index 0000000..02ccc69
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application.Contracts/CMSPluginDtoExtensions.cs"
@@ -0,0 +1,32 @@
+using Volo.Abp.Threading;
+
+namespace CMS.Plugin.WareCmsUtilityApi.Application.Contracts;
+
+/// <summary>
+/// Dto鎵╁睍
+/// </summary>
+public static class CMSPluginDtoExtensions
+{
+ private static readonly OneTimeRunner OneTimeRunner = new OneTimeRunner();
+
+ /// <summary>
+ /// Configures this instance.
+ /// </summary>
+ public static void Configure()
+ {
+ OneTimeRunner.Run(() =>
+ {
+ /* You can add extension properties to DTOs
+ * defined in the depended modules.
+ *
+ * Example:
+ *
+ * ObjectExtensionManager.Instance
+ * .AddOrUpdateProperty<IdentityRoleDto, string>("Title");
+ *
+ * See the documentation for more:
+ * https://docs.abp.io/en/abp/latest/Object-Extensions
+ */
+ });
+ }
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application.Contracts/Dtos/Samples/GetSamplesInput.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application.Contracts/Dtos/Samples/GetSamplesInput.cs"
new file mode 100644
index 0000000..816c791
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application.Contracts/Dtos/Samples/GetSamplesInput.cs"
@@ -0,0 +1,19 @@
+using Volo.Abp.Application.Dtos;
+
+namespace CMS.Plugin.WareCmsUtilityApi.Application.Contracts.Dtos.Samples;
+
+/// <summary>
+/// Sample鏌ヨ鍙傛暟瀵硅薄
+/// </summary>
+public class GetSamplesInput : ExtensiblePagedAndSortedResultRequestDto
+{
+ /// <summary>
+ /// Gets or sets the filter.
+ /// </summary>
+ public string Filter { get; set; }
+
+ /// <summary>
+ /// Gets or sets the name.
+ /// </summary>
+ public string Name { get; set; }
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application.Contracts/Dtos/Samples/SampleCreateDto.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application.Contracts/Dtos/Samples/SampleCreateDto.cs"
new file mode 100644
index 0000000..55b0963
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application.Contracts/Dtos/Samples/SampleCreateDto.cs"
@@ -0,0 +1,17 @@
+namespace CMS.Plugin.WareCmsUtilityApi.Application.Contracts.Dtos.Samples;
+
+/// <summary>
+/// Sample鍒涘缓鍙傛暟瀵硅薄
+/// </summary>
+public class SampleCreateDto : SampleCreateOrUpdateDtoBase
+{
+ /// <summary>
+ /// 鎺掑簭
+ /// </summary>
+ public virtual int? Sort { get; set; }
+
+ /// <summary>
+ /// 鏄惁绂佺敤
+ /// </summary>
+ public bool? IsDisabled { get; set; } = false;
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application.Contracts/Dtos/Samples/SampleCreateOrUpdateDtoBase.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application.Contracts/Dtos/Samples/SampleCreateOrUpdateDtoBase.cs"
new file mode 100644
index 0000000..895b689
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application.Contracts/Dtos/Samples/SampleCreateOrUpdateDtoBase.cs"
@@ -0,0 +1,31 @@
+using Volo.Abp.Application.Dtos;
+
+namespace CMS.Plugin.WareCmsUtilityApi.Application.Contracts.Dtos.Samples;
+
+/// <summary>
+/// Sample鍒涘缓鎴栨洿鏂板熀绫�
+/// </summary>
+public abstract class SampleCreateOrUpdateDtoBase : ExtensibleEntityDto
+{
+ /// <summary>
+ /// 缂栧彿
+ /// </summary>
+ public virtual string Code { get; set; }
+
+ /// <summary>
+ /// 鍚嶇О
+ /// </summary>
+ public virtual string Name { get; set; }
+
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+ public virtual string Remark { get; set; }
+
+ /// <summary>
+ /// Initializes a new instance of the <see cref="SampleCreateOrUpdateDtoBase"/> class.
+ /// </summary>
+ public SampleCreateOrUpdateDtoBase() : base(false)
+ {
+ }
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application.Contracts/Dtos/Samples/SampleDto.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application.Contracts/Dtos/Samples/SampleDto.cs"
new file mode 100644
index 0000000..68b5f5d
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application.Contracts/Dtos/Samples/SampleDto.cs"
@@ -0,0 +1,55 @@
+using Volo.Abp.Application.Dtos;
+using Volo.Abp.Domain.Entities;
+
+namespace CMS.Plugin.WareCmsUtilityApi.Application.Contracts.Dtos.Samples;
+
+/// <summary>
+/// Sample鏁版嵁鍙傛暟瀵硅薄
+/// </summary>
+public class SampleDto : ExtensibleEntityDto<Guid>, IHasConcurrencyStamp
+{
+ /// <summary>
+ /// 缂栧彿
+ /// </summary>
+ public virtual string Code { get; set; }
+
+ /// <summary>
+ /// 鍚嶇О
+ /// </summary>
+ public virtual string Name { get; set; }
+
+ /// <summary>
+ /// 鎺掑簭
+ /// </summary>
+ public virtual int Sort { get; set; }
+
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+ public virtual string Remark { get; set; }
+
+ /// <summary>
+ /// 鏄惁绂佺敤
+ /// </summary>
+ public virtual bool? IsDisabled { get; set; }
+
+ /// <summary>
+ /// 骞跺彂鎴�
+ /// </summary>
+ public string ConcurrencyStamp { get; set; }
+
+ /// <summary>
+ /// Gets the export data.
+ /// </summary>
+ /// <returns></returns>
+ public Dictionary<string, object> GetExportData()
+ {
+ var exportData = new Dictionary<string, object>();
+ foreach (var property in this.GetType().GetProperties())
+ {
+ exportData.Add(property.Name, property.GetValue(this));
+ }
+
+ return exportData;
+ }
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application.Contracts/Dtos/Samples/SampleUpdateDto.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application.Contracts/Dtos/Samples/SampleUpdateDto.cs"
new file mode 100644
index 0000000..6983218
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application.Contracts/Dtos/Samples/SampleUpdateDto.cs"
@@ -0,0 +1,14 @@
+using Volo.Abp.Domain.Entities;
+
+namespace CMS.Plugin.WareCmsUtilityApi.Application.Contracts.Dtos.Samples;
+
+/// <summary>
+/// Sample鏇存柊鍙傛暟瀵硅薄
+/// </summary>
+public class SampleUpdateDto : SampleCreateOrUpdateDtoBase, IHasConcurrencyStamp
+{
+ /// <summary>
+ /// 骞跺彂鎴�
+ /// </summary>
+ public string ConcurrencyStamp { get; set; }
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application.Contracts/Dtos/Samples/SamplesExportModel.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application.Contracts/Dtos/Samples/SamplesExportModel.cs"
new file mode 100644
index 0000000..28bb740
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application.Contracts/Dtos/Samples/SamplesExportModel.cs"
@@ -0,0 +1,25 @@
+using MiniExcelLibs.Attributes;
+
+namespace CMS.Plugin.WareCmsUtilityApi.Application.Contracts.Dtos.Samples
+{
+ /// <summary>
+ /// Samples瀵煎嚭妯″瀷
+ /// </summary>
+ public class SamplesExportModel
+ {
+ /// <summary>
+ /// Sample瀵煎嚭妯″瀷
+ /// </summary>
+ public class WorkSectionExportModel
+ {
+ [ExcelColumn(Name = "鍚嶇О", Width = 25)]
+ public virtual string Name { get; set; }
+
+ [ExcelColumn(Name = "缂栧彿", Width = 25)]
+ public virtual string Code { get; set; }
+
+ [ExcelColumn(Name = "澶囨敞", Width = 25)]
+ public virtual string Remark { get; set; }
+ }
+ }
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application.Contracts/Dtos/Samples/SamplesImportModel.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application.Contracts/Dtos/Samples/SamplesImportModel.cs"
new file mode 100644
index 0000000..625ad23
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application.Contracts/Dtos/Samples/SamplesImportModel.cs"
@@ -0,0 +1,34 @@
+using static CMS.Plugin.WareCmsUtilityApi.Application.Contracts.Dtos.Samples.SamplesExportModel;
+
+namespace CMS.Plugin.WareCmsUtilityApi.Application.Contracts.Dtos.Samples
+{
+ /// <summary>
+ /// Samples瀵煎叆妯″瀷
+ /// </summary>
+ public class SamplesImportModel
+ {
+ private List<SampleImportModel> _samples = new();
+
+ public List<SampleImportModel> Samples
+ {
+ get => _samples;
+ set
+ {
+ _samples = value;
+ var rowIndex = 2;
+ _samples?.ForEach(x => x.RowIndex = rowIndex++);
+ }
+ }
+
+ /// <summary>
+ /// Sample瀵煎叆妯″瀷
+ /// </summary>
+ public class SampleImportModel : WorkSectionExportModel
+ {
+ /// <summary>
+ /// 琛屽彿
+ /// </summary>
+ public int RowIndex { get; set; }
+ }
+ }
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/FodyWeavers.xml" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application.Contracts/FodyWeavers.xml"
similarity index 100%
rename from "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application.Contracts/FodyWeavers.xml"
rename to "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application.Contracts/FodyWeavers.xml"
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application.Contracts/ICMSPluginQueryAppService.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application.Contracts/ICMSPluginQueryAppService.cs"
new file mode 100644
index 0000000..f9f3ed9
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application.Contracts/ICMSPluginQueryAppService.cs"
@@ -0,0 +1,10 @@
+using Volo.Abp.Application.Services;
+
+namespace CMS.Plugin.WareCmsUtilityApi.Application.Contracts;
+
+/// <summary>
+/// 鏌ヨ搴旂敤鏈嶅姟
+/// </summary>
+public interface ICMSPluginQueryAppService : IApplicationService
+{
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application.Contracts/Services/ISampleAppService.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application.Contracts/Services/ISampleAppService.cs"
new file mode 100644
index 0000000..d80c705
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application.Contracts/Services/ISampleAppService.cs"
@@ -0,0 +1,46 @@
+using CMS.Plugin.WareCmsUtilityApi.Application.Contracts.Dtos.Samples;
+using Volo.Abp.Application.Services;
+
+namespace CMS.Plugin.WareCmsUtilityApi.Application.Contracts.Services;
+
+/// <summary>
+/// Sample搴旂敤鏈嶅姟
+/// </summary>
+public interface ISampleAppService : ICrudAppService<SampleDto, Guid, GetSamplesInput, SampleCreateDto, SampleUpdateDto>
+{
+ /// <summary>
+ /// Clones the asynchronous.
+ /// </summary>
+ /// <param name="ids">The ids.</param>
+ /// <returns></returns>
+ Task<List<SampleDto>> CloneAsync(IEnumerable<Guid> ids);
+
+ /// <summary>
+ /// Deletes the many asynchronous.
+ /// </summary>
+ /// <param name="ids">The ids.</param>
+ /// <returns></returns>
+ Task DeleteManyAsync(IEnumerable<Guid> ids);
+
+ /// <summary>
+ /// Adjusts the sort asynchronous.
+ /// </summary>
+ /// <param name="id">The identifier.</param>
+ /// <param name="sort">The sort.</param>
+ /// <returns></returns>
+ Task AdjustSortAsync(Guid id, int sort);
+
+ /// <summary>
+ /// Imports the asynchronous.
+ /// </summary>
+ /// <param name="input">The input.</param>
+ /// <returns></returns>
+ Task ImportAsync(SamplesImportModel input);
+
+ /// <summary>
+ /// Exports the asynchronous.
+ /// </summary>
+ /// <param name="input">The input.</param>
+ /// <returns></returns>
+ Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetSamplesInput input);
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application/CMS.Plugin.WareCmsUtilityApi.Application.csproj" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application/CMS.Plugin.WareCmsUtilityApi.Application.csproj"
new file mode 100644
index 0000000..736bfec
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application/CMS.Plugin.WareCmsUtilityApi.Application.csproj"
@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+ <Import Project="../../common.props" />
+ <Import Project="../../configureawait.props" />
+
+ <PropertyGroup>
+ <TargetFramework>net6.0</TargetFramework>
+ </PropertyGroup>
+
+ <ItemGroup>
+ <PackageReference Include="Volo.Abp.Dapper" Version="$(ABPPackageVersion)" />
+ <PackageReference Include="Volo.Abp.AutoMapper" Version="$(ABPPackageVersion)" />
+ <PackageReference Include="Volo.Abp.Ddd.Application" Version="$(ABPPackageVersion)" />
+ </ItemGroup>
+
+ <ItemGroup>
+ <ProjectReference Include="..\CMS.Plugin.WareCmsUtilityApi.Application.Contracts\CMS.Plugin.WareCmsUtilityApi.Application.Contracts.csproj" />
+ <ProjectReference Include="..\CMS.Plugin.WareCmsUtilityApi.Domain\CMS.Plugin.WareCmsUtilityApi.Domain.csproj" />
+ </ItemGroup>
+
+</Project>
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application/CMSPluginAppService.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application/CMSPluginAppService.cs"
new file mode 100644
index 0000000..d0a92fb
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application/CMSPluginAppService.cs"
@@ -0,0 +1,19 @@
+using CMS.Plugin.WareCmsUtilityApi.Domain.Shared.Localization;
+using Volo.Abp.Application.Services;
+
+namespace CMS.Plugin.WareCmsUtilityApi.Application;
+
+/// <summary>
+/// Inherit your application services from this class.
+/// </summary>
+public abstract class CMSPluginAppService : ApplicationService
+{
+ /// <summary>
+ /// Initializes a new instance of the <see cref="CMSPluginAppService"/> class.
+ /// </summary>
+ protected CMSPluginAppService()
+ {
+ ObjectMapperContext = typeof(CMSPluginApplicationModule);
+ LocalizationResource = typeof(WareCmsUtilityApiResource);
+ }
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application/CMSPluginApplicationModule.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application/CMSPluginApplicationModule.cs"
new file mode 100644
index 0000000..98cfc1d
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application/CMSPluginApplicationModule.cs"
@@ -0,0 +1,31 @@
+using CMS.Plugin.WareCmsUtilityApi.Application.Contracts;
+using CMS.Plugin.WareCmsUtilityApi.Domain;
+using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp.Application;
+using Volo.Abp.AutoMapper;
+using Volo.Abp.EventBus;
+using Volo.Abp.Modularity;
+
+namespace CMS.Plugin.WareCmsUtilityApi.Application;
+
+/// <summary>
+/// 鎻掍欢搴旂敤鏈嶅姟妯″潡
+/// </summary>
+[DependsOn(
+ typeof(CMSPluginDomainModule),
+ typeof(CMSPluginApplicationContractsModule),
+ typeof(AbpAutoMapperModule),
+ typeof(AbpEventBusModule),
+ typeof(AbpDddApplicationModule)
+ )]
+public class CMSPluginApplicationModule : AbpModule
+{
+ public override void ConfigureServices(ServiceConfigurationContext context)
+ {
+ context.Services.AddAutoMapperObjectMapper<CMSPluginApplicationModule>();
+ Configure<AbpAutoMapperOptions>(options =>
+ {
+ options.AddMaps<CMSPluginApplicationModule>(validate: true);
+ });
+ }
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application/CMSPluginQueryAppService.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application/CMSPluginQueryAppService.cs"
new file mode 100644
index 0000000..71ef5de
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application/CMSPluginQueryAppService.cs"
@@ -0,0 +1,19 @@
+using CMS.Plugin.WareCmsUtilityApi.Application.Contracts;
+using CMS.Plugin.WareCmsUtilityApi.Domain.Data;
+
+namespace CMS.Plugin.WareCmsUtilityApi.Application;
+
+/// <inheritdoc />
+public class CMSPluginQueryAppService : CMSPluginAppService, ICMSPluginQueryAppService
+{
+ private readonly ICMSPluginDapperRepository _dapperRepository;
+
+ /// <summary>
+ /// Initializes a new instance of the <see cref="CMSPluginQueryAppService"/> class.
+ /// </summary>
+ /// <param name="dapperRepository">The dapper repository.</param>
+ public CMSPluginQueryAppService(ICMSPluginDapperRepository dapperRepository)
+ {
+ _dapperRepository = dapperRepository;
+ }
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application/FodyWeavers.xml" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application/FodyWeavers.xml"
similarity index 100%
rename from "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application/FodyWeavers.xml"
rename to "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application/FodyWeavers.xml"
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application/Implements/SampleAppService.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application/Implements/SampleAppService.cs"
new file mode 100644
index 0000000..97f3915
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application/Implements/SampleAppService.cs"
@@ -0,0 +1,308 @@
+using CMS.Plugin.WareCmsUtilityApi.Application.Contracts.Dtos.Samples;
+using CMS.Plugin.WareCmsUtilityApi.Application.Contracts.Services;
+using CMS.Plugin.WareCmsUtilityApi.Domain.Samples;
+using CMS.Plugin.WareCmsUtilityApi.Domain.Shared;
+using CMS.Plugin.WareCmsUtilityApi.Domain.Shared.Samples;
+using Volo.Abp;
+using Volo.Abp.Application.Dtos;
+using Volo.Abp.Data;
+using Volo.Abp.ObjectExtending;
+
+namespace CMS.Plugin.WareCmsUtilityApi.Application.Implements;
+
+/// <inheritdoc />
+public class SampleAppService : CMSPluginAppService, ISampleAppService
+{
+ private readonly ISampleRepository _sampleRepository;
+
+ /// <summary>
+ /// Initializes a new instance of the <see cref="SampleAppService"/> class.
+ /// </summary>
+ /// <param name="sampleRepository">The task job repository.</param>
+ public SampleAppService(ISampleRepository sampleRepository)
+ {
+ _sampleRepository = sampleRepository;
+ }
+
+ /// <inheritdoc />
+ public virtual async Task<SampleDto> GetAsync(Guid id)
+ {
+ return ObjectMapper.Map<Sample, SampleDto>(await _sampleRepository.GetAsync(id));
+ }
+
+ /// <inheritdoc />
+ public virtual async Task<PagedResultDto<SampleDto>> GetListAsync(GetSamplesInput input)
+ {
+ Check.NotNull(input, nameof(input));
+
+ if (input.Sorting.IsNullOrWhiteSpace())
+ {
+ input.Sorting = nameof(Sample.Sort);
+ }
+
+ var specification = new SampleSpecification(input.Name);
+ var count = await _sampleRepository.GetCountAsync(input.Filter, specification);
+ var list = await _sampleRepository.GetListAsync(input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter, specification);
+
+ return new PagedResultDto<SampleDto>(count, ObjectMapper.Map<List<Sample>, List<SampleDto>>(list));
+ }
+
+ /// <inheritdoc />
+ public virtual async Task<SampleDto> CreateAsync(SampleCreateDto input)
+ {
+ await CheckCreateOrUpdateDtoAsync(input);
+
+ var exist = await _sampleRepository.NameExistAsync(input.Name);
+ if (exist)
+ {
+ throw new UserFriendlyException(L[CMSPluginDomainErrorCodes.NameAlreadyExists, input.Name]);
+ }
+
+ var maxSort = await _sampleRepository.GetMaxSortAsync();
+ var sort = input.Sort ?? maxSort;
+ var sample = new Sample(GuidGenerator.Create(), input.Code, input.Name, sort, input.Remark);
+ input.MapExtraPropertiesTo(sample, MappingPropertyDefinitionChecks.None);
+
+ await _sampleRepository.InsertAsync(sample);
+
+ if (input.Sort.HasValue && sample.Sort != maxSort)
+ {
+ await AdjustSortAsync(sample.Id, sample.Sort);
+ }
+
+ return ObjectMapper.Map<Sample, SampleDto>(sample);
+ }
+
+ /// <inheritdoc />
+ public virtual async Task<SampleDto> UpdateAsync(Guid id, SampleUpdateDto input)
+ {
+ await CheckCreateOrUpdateDtoAsync(input);
+
+ var sample = await _sampleRepository.GetAsync(id);
+ var exist = await _sampleRepository.NameExistAsync(input.Name, sample.Id);
+ if (exist)
+ {
+ throw new UserFriendlyException(L[CMSPluginDomainErrorCodes.NameAlreadyExists, input.Name]);
+ }
+
+ sample.SetConcurrencyStampIfNotNull(input.ConcurrencyStamp);
+ input.MapExtraPropertiesTo(sample, MappingPropertyDefinitionChecks.None);
+
+ sample.Update(input.Code, input.Name, input.Remark);
+
+ await _sampleRepository.UpdateAsync(sample);
+
+ return ObjectMapper.Map<Sample, SampleDto>(sample);
+ }
+
+ /// <inheritdoc />
+ public async Task<List<SampleDto>> CloneAsync(IEnumerable<Guid> ids)
+ {
+ var samples = new List<Sample>();
+ if (ids != null)
+ {
+ var sort = await _sampleRepository.GetMaxSortAsync();
+ foreach (var id in ids)
+ {
+ var sample = await _sampleRepository.FindAsync(id);
+ if (sample != null)
+ {
+ var name = sample.Name + SampleConsts.CloneTag;
+ var notExist = false;
+ while (!notExist)
+ {
+ var exist = await _sampleRepository.NameExistAsync(name);
+ if (exist || samples.Any(x => x.Name == name))
+ {
+ name += SampleConsts.CloneTag;
+ continue;
+ }
+
+ notExist = true;
+ }
+
+ sample = await _sampleRepository.InsertAsync(sample.Clone(GuidGenerator.Create(), name, sort++));
+ samples.Add(sample);
+ }
+ }
+ }
+
+ return ObjectMapper.Map<List<Sample>, List<SampleDto>>(samples);
+ }
+
+ /// <inheritdoc />
+ public virtual Task DeleteAsync(Guid id)
+ {
+ return _sampleRepository.DeleteAsync(id);
+ }
+
+ /// <inheritdoc />
+ public async Task DeleteManyAsync(IEnumerable<Guid> ids)
+ {
+ foreach (var id in ids)
+ {
+ await DeleteAsync(id);
+ }
+ }
+
+ /// <inheritdoc />
+ public virtual async Task AdjustSortAsync(Guid id, int sort)
+ {
+ var list = await _sampleRepository.GetListAsync(nameof(Sample.Sort));
+ if (list != null && list.Any())
+ {
+ var initSort = 1;
+ list.ForEach(x => x.AdjustSort(initSort++));
+ var entity = list.FirstOrDefault(x => x.Id == id);
+ if (entity != null)
+ {
+ if (sort == 1)
+ {
+ list.Where(x => x.Id != id).ToList()?.ForEach(x => x.AdjustSort(x.Sort + 1));
+ }
+ else if (entity.Sort > sort)
+ {
+ list.Where(x => x.Id != id && x.Sort >= sort).ToList()?.ForEach(x => x.AdjustSort(x.Sort + 1));
+ list.Where(x => x.Id != id && x.Sort < sort).ToList()?.ForEach(x => x.AdjustSort(x.Sort - 1));
+ }
+ else if (entity.Sort < sort)
+ {
+ list.Where(x => x.Id != id && x.Sort > sort).ToList()?.ForEach(x => x.AdjustSort(x.Sort + 1));
+ list.Where(x => x.Id != id && x.Sort <= sort).ToList()?.ForEach(x => x.AdjustSort(x.Sort - 1));
+ }
+
+ entity.AdjustSort(sort);
+ }
+ }
+
+ await _sampleRepository.UpdateManyAsync(list);
+ }
+
+ /// <inheritdoc />
+ public async Task ImportAsync(SamplesImportModel input)
+ {
+ Check.NotNull(input, nameof(input));
+
+ var sampleCreateDtos = new List<(int RowIndex, SampleCreateDto Item)>();
+ var sampleUpdateDtos = new List<(int RowIndex, Guid Id, SampleUpdateDto Item)>();
+ var samples = input.Samples;
+
+ if (samples != null && samples.Any())
+ {
+ #region 瀵煎叆鏍￠獙
+
+ // 鍒ゆ柇鍚嶇О鏄惁閲嶅锛屽苟杈撳嚭绗嚑琛岄噸澶�
+ var duplicateSamples = samples.GroupBy(x => x.Name).Where(x => x.Count() > 1).ToList();
+ if (duplicateSamples?.Any() == true)
+ {
+ var duplicateSampleMsgs = duplicateSamples.Select(x => $"绗� {string.Join(",", x.Select(x => x.RowIndex))} 琛岋細{x.Key} 鍚嶇О閲嶅");
+ var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝 {string.Join(",", duplicateSampleMsgs)}锛岀粓姝㈠鍏�";
+ throw new UserFriendlyException(errorMsg);
+ }
+
+ #endregion
+
+ foreach (var sample in samples)
+ {
+ if (sample.Code.IsNullOrWhiteSpace() && sample.Name.IsNullOrWhiteSpace())
+ {
+ continue;
+ }
+
+ if (sample.Name.IsNullOrWhiteSpace())
+ {
+ var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝绗瑊sample.RowIndex}琛岋細Sample鍚嶇О涓嶈兘涓虹┖";
+ throw new UserFriendlyException(errorMsg);
+ }
+
+ var oldSample = await _sampleRepository.FindByNameAsync(sample.Name);
+ if (oldSample != null)
+ {
+ var sampleUpdateDto = new SampleUpdateDto
+ {
+ Code = sample.Code,
+ Name = sample.Name,
+ Remark = sample.Remark,
+ };
+
+ sampleUpdateDtos.Add((sample.RowIndex, oldSample.Id, sampleUpdateDto));
+ }
+ else
+ {
+ var sampleCreateDto = new SampleCreateDto
+ {
+ Code = sample.Code,
+ Name = sample.Name,
+ Remark = sample.Remark,
+ };
+
+ sampleCreateDtos.Add((sample.RowIndex, sampleCreateDto));
+ }
+ }
+ }
+
+ // 鏂板
+ foreach (var sampleDto in sampleCreateDtos)
+ {
+ try
+ {
+ await CreateAsync(sampleDto.Item);
+ }
+ catch (Exception e)
+ {
+ var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝绗瑊sampleDto.RowIndex}琛岋細{e.Message}锛岀粓姝㈠鍏�";
+ throw new UserFriendlyException(errorMsg);
+ }
+ }
+
+ // 鏇存柊
+ foreach (var sampleDto in sampleUpdateDtos)
+ {
+ try
+ {
+ await UpdateAsync(sampleDto.Id, sampleDto.Item);
+ }
+ catch (Exception e)
+ {
+ var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝绗瑊sampleDto.RowIndex}琛岋細{e.Message}锛岀粓姝㈠鍏�";
+ throw new UserFriendlyException(errorMsg);
+ }
+ }
+ }
+
+ /// <inheritdoc />
+ public async Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetSamplesInput input)
+ {
+ Check.NotNull(input, nameof(input));
+
+ if (input.Sorting.IsNullOrWhiteSpace())
+ {
+ input.Sorting = nameof(Sample.Sort);
+ }
+
+ var specification = new SampleSpecification(input.Name);
+ var list = await _sampleRepository.GetListAsync(input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter, specification, includeDetails: true);
+ var result = ObjectMapper.Map<List<Sample>, List<SampleDto>>(list);
+
+ var sheets = new Dictionary<string, object>
+ {
+ ["閰嶇疆"] = result.Select(x => x.GetExportData()).ToList(),
+ };
+
+ var fileName = result.Count > 1 ? "Sample鍒楄〃" : result.Count == 1 ? result.First()?.Name : "Sample妯＄増";
+ return (sheets, fileName);
+ }
+
+ /// <summary>
+ /// Checks the create or update dto asynchronous.
+ /// </summary>
+ /// <param name="input">The input.</param>
+ protected Task CheckCreateOrUpdateDtoAsync(SampleCreateOrUpdateDtoBase input)
+ {
+ Check.NotNull(input, nameof(input));
+ Check.NotNullOrWhiteSpace(input.Code, "缂栧彿", SampleConsts.MaxCodeLength);
+ Check.NotNullOrWhiteSpace(input.Name, "鍚嶇О", SampleConsts.MaxNameLength);
+ Check.Length(input.Remark, "澶囨敞", SampleConsts.MaxRemarkLength);
+ return Task.CompletedTask;
+ }
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application/MapperProfiles/SampleAutoMapperProfile.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application/MapperProfiles/SampleAutoMapperProfile.cs"
new file mode 100644
index 0000000..128eb01
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application/MapperProfiles/SampleAutoMapperProfile.cs"
@@ -0,0 +1,24 @@
+using AutoMapper;
+using CMS.Plugin.WareCmsUtilityApi.Application.Contracts.Dtos.Samples;
+using CMS.Plugin.WareCmsUtilityApi.Domain.Samples;
+using Volo.Abp.ObjectExtending;
+
+namespace CMS.Plugin.WareCmsUtilityApi.Application.MapperProfiles;
+
+/// <summary>
+/// AutoMapper閰嶇疆
+/// </summary>
+/// <seealso cref="AutoMapper.Profile" />
+public class SampleAutoMapperProfile : Profile
+{
+ /// <summary>
+ /// Initializes a new instance of the <see cref="SampleAutoMapperProfile"/> class.
+ /// </summary>
+ public SampleAutoMapperProfile()
+ {
+ /* You can configure your AutoMapper mapping configuration here.
+ * Alternatively, you can split your mapping configurations
+ * into multiple profile classes for a better organization. */
+ CreateMap<Sample, SampleDto>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None);
+ }
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application/Properties/AssemblyInfo.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application/Properties/AssemblyInfo.cs"
similarity index 100%
rename from "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Application/Properties/AssemblyInfo.cs"
rename to "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Application/Properties/AssemblyInfo.cs"
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain.Shared/CMS.Plugin.WareCmsUtilityApi.Domain.Shared.csproj" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain.Shared/CMS.Plugin.WareCmsUtilityApi.Domain.Shared.csproj"
new file mode 100644
index 0000000..1647cec
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain.Shared/CMS.Plugin.WareCmsUtilityApi.Domain.Shared.csproj"
@@ -0,0 +1,28 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+ <Import Project="../../common.props" />
+ <Import Project="../../configureawait.props" />
+
+ <PropertyGroup>
+ <TargetFramework>net6.0</TargetFramework>
+ <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
+ <GenerateDocumentationFile>True</GenerateDocumentationFile>
+ </PropertyGroup>
+
+ <ItemGroup>
+ <PackageReference Include="KissUtil" Version="1.0.1" />
+ <PackageReference Include="Volo.Abp.Localization" Version="$(ABPPackageVersion)" />
+ <PackageReference Include="Volo.Abp.Validation" Version="$(ABPPackageVersion)" />
+ </ItemGroup>
+
+ <ItemGroup>
+ <EmbeddedResource Include="Localization\WareCmsUtilityApi\*.json" />
+ <Content Remove="Localization\WareCmsUtilityApi\*.json" />
+ </ItemGroup>
+
+ <ItemGroup>
+ <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
+ <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="6.0.20" />
+ </ItemGroup>
+
+</Project>
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain.Shared/CMSPluginDomainErrorCodes.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain.Shared/CMSPluginDomainErrorCodes.cs"
new file mode 100644
index 0000000..367aea5
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain.Shared/CMSPluginDomainErrorCodes.cs"
@@ -0,0 +1,16 @@
+namespace CMS.Plugin.WareCmsUtilityApi.Domain.Shared;
+
+/// <summary>
+/// 閿欒缂栫爜瀹氫箟
+/// </summary>
+public static class CMSPluginDomainErrorCodes
+{
+ /// <summary>
+ /// The prefix
+ /// </summary>
+ private const string Prefix = "CMS.Plugin.WareCmsUtilityApi:";
+
+ /* You can add your business exception error codes here, as constants */
+
+ public const string NameAlreadyExists = Prefix + nameof(NameAlreadyExists);
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain.Shared/CMSPluginDomainSharedModule.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain.Shared/CMSPluginDomainSharedModule.cs"
new file mode 100644
index 0000000..2ee05a3
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain.Shared/CMSPluginDomainSharedModule.cs"
@@ -0,0 +1,41 @@
+using CMS.Plugin.WareCmsUtilityApi.Domain.Shared.Localization;
+using Volo.Abp.Localization;
+using Volo.Abp.Modularity;
+using Volo.Abp.Validation;
+using Volo.Abp.Validation.Localization;
+using Volo.Abp.VirtualFileSystem;
+
+namespace CMS.Plugin.WareCmsUtilityApi.Domain.Shared;
+
+/// <summary>
+/// 棰嗗煙鍏变韩妯″潡
+/// </summary>
+[DependsOn(typeof(AbpLocalizationModule),
+ typeof(AbpValidationModule))]
+public class CMSPluginDomainSharedModule : AbpModule
+{
+ /// <inheritdoc />
+ public override void PreConfigureServices(ServiceConfigurationContext context)
+ {
+ CMSPluginModuleExtensionConfigurator.Configure();
+ }
+
+ /// <inheritdoc />
+ public override void ConfigureServices(ServiceConfigurationContext context)
+ {
+ Configure<AbpVirtualFileSystemOptions>(options =>
+ {
+ options.FileSets.AddEmbedded<CMSPluginDomainSharedModule>();
+ });
+
+ Configure<AbpLocalizationOptions>(options =>
+ {
+ options.Resources
+ .Add<WareCmsUtilityApiResource>("en")
+ .AddBaseTypes(typeof(AbpValidationResource))
+ .AddVirtualJson("/Localization/WareCmsUtilityApi");
+
+ options.DefaultResourceType = typeof(WareCmsUtilityApiResource);
+ });
+ }
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain.Shared/CMSPluginModuleExtensionConfigurator.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain.Shared/CMSPluginModuleExtensionConfigurator.cs"
new file mode 100644
index 0000000..ceb6673
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain.Shared/CMSPluginModuleExtensionConfigurator.cs"
@@ -0,0 +1,82 @@
+using Volo.Abp.Threading;
+
+namespace CMS.Plugin.WareCmsUtilityApi.Domain.Shared;
+
+/// <summary>
+/// 妯″潡鎵╁睍閰嶇疆鍣�
+/// </summary>
+public static class CMSPluginModuleExtensionConfigurator
+{
+ private static readonly OneTimeRunner OneTimeRunner = new OneTimeRunner();
+
+ /// <summary>
+ /// Configures this instance.
+ /// </summary>
+ public static void Configure()
+ {
+ OneTimeRunner.Run(() =>
+ {
+ ConfigureExistingProperties();
+ ConfigureExtraProperties();
+ });
+ }
+
+ /// <summary>
+ /// Configures the existing properties.
+ /// </summary>
+ private static void ConfigureExistingProperties()
+ {
+ /* You can change max lengths for properties of the
+ * entities defined in the modules used by your application.
+ *
+ * Example: Change user and role name max lengths
+
+ IdentityUserConsts.MaxNameLength = 99;
+ IdentityRoleConsts.MaxNameLength = 99;
+
+ * Notice: It is not suggested to change property lengths
+ * unless you really need it. Go with the standard values wherever possible.
+ *
+ * If you are using EF Core, you will need to run the add-migration command after your changes.
+ */
+ }
+
+ /// <summary>
+ /// Configures the extra properties.
+ /// </summary>
+ private static void ConfigureExtraProperties()
+ {
+ /* You can configure extra properties for the
+ * entities defined in the modules used by your application.
+ *
+ * This class can be used to define these extra properties
+ * with a high level, easy to use API.
+ *
+ * Example: Add a new property to the user entity of the identity module
+
+ ObjectExtensionManager.Instance.Modules()
+ .ConfigureIdentity(identity =>
+ {
+ identity.ConfigureUser(user =>
+ {
+ user.AddOrUpdateProperty<string>( //property type: string
+ "SocialSecurityNumber", //property name
+ property =>
+ {
+ //validation rules
+ property.Attributes.Add(new RequiredAttribute());
+ property.Attributes.Add(new StringLengthAttribute(64) {MinimumLength = 4});
+
+ property.Configuration[IdentityModuleExtensionConsts.ConfigurationNames.AllowUserToEdit] = true;
+
+ //...other configurations for this property
+ }
+ );
+ });
+ });
+
+ * See the documentation for more:
+ * https://docs.abp.io/en/abp/latest/Module-Entity-Extensions
+ */
+ }
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain.Shared/Enums/WareCmsUtilityApiStatus.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain.Shared/Enums/WareCmsUtilityApiStatus.cs"
new file mode 100644
index 0000000..3e8dc25
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain.Shared/Enums/WareCmsUtilityApiStatus.cs"
@@ -0,0 +1,34 @@
+using System.ComponentModel;
+
+namespace CMS.Plugin.WareCmsUtilityApi.Domain.Shared.Enums
+{
+ /// <summary>
+ /// WareCmsUtilityApi鐘舵��
+ /// </summary>
+ public enum WareCmsUtilityApiStatus : byte
+ {
+ /// <summary>
+ /// 鏈墽琛�
+ /// </summary>
+ [Description("鏈墽琛�")]
+ Initial = 0,
+
+ /// <summary>
+ /// 鎵ц涓�
+ /// </summary>
+ [Description("鎵ц涓�")]
+ Excuting = 1,
+
+ /// <summary>
+ /// 宸插畬鎴�
+ /// </summary>
+ [Description("宸插畬鎴�")]
+ Completed = 4,
+
+ /// <summary>
+ /// 宸插己鍒跺畬鎴�
+ /// </summary>
+ [Description("宸插畬鎴�")]
+ Finished = 5,
+ }
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/FodyWeavers.xml" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain.Shared/FodyWeavers.xml"
similarity index 100%
rename from "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain.Shared/FodyWeavers.xml"
rename to "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain.Shared/FodyWeavers.xml"
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain.Shared/Localization/WareCmsUtilityApi/en.json" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain.Shared/Localization/WareCmsUtilityApi/en.json"
new file mode 100644
index 0000000..2eda2ad
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain.Shared/Localization/WareCmsUtilityApi/en.json"
@@ -0,0 +1,7 @@
+{
+ "culture": "en",
+ "texts": {
+ "DisplayName:SCMS.AppSettings.WareCmsUtilityApi.PluginState": "WareCmsUtilityApi plugin state",
+ "CMS.Plugin.WareCmsUtilityApi:NameAlreadyExists": "The '{0}' name already exists, please re-enter it !"
+ }
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain.Shared/Localization/WareCmsUtilityApi/zh-Hans.json" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain.Shared/Localization/WareCmsUtilityApi/zh-Hans.json"
new file mode 100644
index 0000000..89f7240
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain.Shared/Localization/WareCmsUtilityApi/zh-Hans.json"
@@ -0,0 +1,7 @@
+{
+ "culture": "zh-Hans",
+ "texts": {
+ "DisplayName:SCMS.AppSettings.WareCmsUtilityApi.PluginState": "WareCmsUtilityApi 鎻掍欢鐘舵��",
+ "CMS.Plugin.WareCmsUtilityApi:NameAlreadyExists": "璇�'{0}'鍚嶇О宸插瓨鍦紝璇烽噸鏂拌緭鍏ワ紒"
+ }
+ }
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain.Shared/Localization/WareCmsUtilityApiResource.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain.Shared/Localization/WareCmsUtilityApiResource.cs"
new file mode 100644
index 0000000..498c261
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain.Shared/Localization/WareCmsUtilityApiResource.cs"
@@ -0,0 +1,11 @@
+using Volo.Abp.Localization;
+
+namespace CMS.Plugin.WareCmsUtilityApi.Domain.Shared.Localization;
+
+/// <summary>
+/// WareCmsUtilityApi鏈湴鍖栬祫婧�
+/// </summary>
+[LocalizationResourceName("WareCmsUtilityApi")]
+public class WareCmsUtilityApiResource
+{
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain.Shared/Samples/SampleConsts.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain.Shared/Samples/SampleConsts.cs"
new file mode 100644
index 0000000..9c2c2a8
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain.Shared/Samples/SampleConsts.cs"
@@ -0,0 +1,12 @@
+namespace CMS.Plugin.WareCmsUtilityApi.Domain.Shared.Samples;
+
+/// <summary>
+/// Sample甯搁噺瀹氫箟
+/// </summary>
+public static class SampleConsts
+{
+ public const string CloneTag = "_鍓湰";
+ public static int MaxCodeLength { get; set; } = 64;
+ public static int MaxNameLength { get; set; } = 64;
+ public static int MaxRemarkLength { get; set; } = 256;
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain.Shared/Samples/SampleEto.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain.Shared/Samples/SampleEto.cs"
new file mode 100644
index 0000000..c62ea21
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain.Shared/Samples/SampleEto.cs"
@@ -0,0 +1,22 @@
+namespace CMS.Plugin.WareCmsUtilityApi.Domain.Shared.Samples;
+
+/// <summary>
+/// Sample浜嬩欢鍙傛暟瀵硅薄
+/// </summary>
+[Serializable]
+public class SampleEto
+{
+ /// <summary>
+ /// Initializes a new instance of the <see cref="SampleEto"/> class.
+ /// </summary>
+ /// <param name="name">The name.</param>
+ public SampleEto(string name)
+ {
+ Name = name;
+ }
+
+ /// <summary>
+ /// 鍚嶇О
+ /// </summary>
+ public string Name { get; }
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain/CMS.Plugin.WareCmsUtilityApi.Domain.csproj" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain/CMS.Plugin.WareCmsUtilityApi.Domain.csproj"
new file mode 100644
index 0000000..af6f7ab
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain/CMS.Plugin.WareCmsUtilityApi.Domain.csproj"
@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+ <Import Project="../../common.props" />
+ <Import Project="../../configureawait.props" />
+
+ <PropertyGroup>
+ <TargetFramework>net6.0</TargetFramework>
+ </PropertyGroup>
+
+ <ItemGroup>
+ <PackageReference Include="Volo.Abp.Ddd.Domain" Version="$(ABPPackageVersion)" />
+ <PackageReference Include="Volo.Abp.Settings" Version="$(ABPPackageVersion)" />
+ <PackageReference Include="Volo.Abp.Caching" Version="$(ABPPackageVersion)" />
+ </ItemGroup>
+
+ <ItemGroup>
+ <ProjectReference Include="..\CMS.Plugin.WareCmsUtilityApi.Abstractions\CMS.Plugin.WareCmsUtilityApi.Abstractions.csproj" />
+ <ProjectReference Include="..\CMS.Plugin.WareCmsUtilityApi.Domain.Shared\CMS.Plugin.WareCmsUtilityApi.Domain.Shared.csproj" />
+ </ItemGroup>
+
+</Project>
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain/CMSPluginDbProperties.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain/CMSPluginDbProperties.cs"
new file mode 100644
index 0000000..c5fb3ee
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain/CMSPluginDbProperties.cs"
@@ -0,0 +1,27 @@
+namespace CMS.Plugin.WareCmsUtilityApi.Domain;
+
+/// <summary>
+/// 鏁版嵁搴撳睘鎬у畾涔�
+/// </summary>
+public static class CMSPluginDbProperties
+{
+ /// <summary>
+ /// Gets or sets the database table prefix.
+ /// </summary>
+ public static string DbTablePrefix { get; set; } = "SCMS";
+
+ /// <summary>
+ /// Gets or sets the database schema.
+ /// </summary>
+ public static string DbSchema { get; set; }
+
+ /// <summary>
+ /// The connection string name
+ /// </summary>
+ public const string ConnectionStringName = "WareCmsUtilityApi";
+
+ /// <summary>
+ /// The migrations history table
+ /// </summary>
+ public const string MigrationsHistoryTable = "__EFMigrationsHistoryForWareCmsUtilityApi";
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain/CMSPluginDomainModule.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain/CMSPluginDomainModule.cs"
new file mode 100644
index 0000000..fcf8297
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain/CMSPluginDomainModule.cs"
@@ -0,0 +1,24 @@
+using CMS.Plugin.WareCmsUtilityApi.Domain.Shared;
+using Volo.Abp.Caching;
+using Volo.Abp.Domain;
+using Volo.Abp.Modularity;
+using Volo.Abp.Settings;
+
+namespace CMS.Plugin.WareCmsUtilityApi.Domain;
+
+/// <summary>
+/// 棰嗗煙妯″潡
+/// </summary>
+[DependsOn(
+ typeof(CMSPluginDomainSharedModule),
+ typeof(AbpSettingsModule),
+ typeof(AbpDddDomainModule),
+ typeof(AbpCachingModule)
+)]
+public class CMSPluginDomainModule : AbpModule
+{
+ /// <inheritdoc />
+ public override void ConfigureServices(ServiceConfigurationContext context)
+ {
+ }
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain/Data/CMSPluginDbMigrationService.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain/Data/CMSPluginDbMigrationService.cs"
new file mode 100644
index 0000000..572d2f9
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain/Data/CMSPluginDbMigrationService.cs"
@@ -0,0 +1,211 @@
+using Microsoft.Extensions.Logging;
+using System.Diagnostics;
+using System.Runtime.InteropServices;
+using Volo.Abp.Data;
+using Volo.Abp.DependencyInjection;
+
+namespace CMS.Plugin.WareCmsUtilityApi.Domain.Data;
+
+/// <summary>
+/// 鏁版嵁搴撹縼绉绘湇鍔�
+/// </summary>
+public class CMSPluginDbMigrationService : ITransientDependency
+{
+ private readonly IDataSeeder _dataSeeder;
+ private readonly IEnumerable<ICMSPluginDbSchemaMigrator> _dbSchemaMigrators;
+ private readonly ILogger<CMSPluginDbMigrationService> _logger;
+
+ /// <summary>
+ /// Initializes a new instance of the <see cref="CMSPluginDbMigrationService"/> class.
+ /// </summary>
+ /// <param name="dataSeeder">The data seeder.</param>
+ /// <param name="dbSchemaMigrators">The database schema migrators.</param>
+ /// <param name="logger">The logger.</param>
+ public CMSPluginDbMigrationService(IDataSeeder dataSeeder,
+ IEnumerable<ICMSPluginDbSchemaMigrator> dbSchemaMigrators, ILogger<CMSPluginDbMigrationService> logger)
+ {
+ _dataSeeder = dataSeeder;
+ _dbSchemaMigrators = dbSchemaMigrators;
+ _logger = logger;
+ }
+
+ /// <summary>
+ /// Migrates the asynchronous.
+ /// </summary>
+ public async Task MigrateAsync()
+ {
+ var initialMigrationAdded = AddInitialMigrationIfNotExist();
+
+ if (initialMigrationAdded)
+ {
+ return;
+ }
+
+ _logger.LogDebug("Started database migrations...");
+
+ await MigrateDatabaseSchemaAsync();
+ await SeedDataAsync();
+
+ _logger.LogDebug($"Successfully completed host database migrations.");
+ _logger.LogDebug("You can safely end this process...");
+ }
+
+ /// <summary>
+ /// Migrates the database schema asynchronous.
+ /// </summary>
+ private async Task MigrateDatabaseSchemaAsync()
+ {
+ _logger.LogDebug($"Migrating schema for database...");
+
+ foreach (var migrator in _dbSchemaMigrators)
+ {
+ await migrator.MigrateAsync();
+ }
+ }
+
+ /// <summary>
+ /// Seeds the data asynchronous.
+ /// </summary>
+ private async Task SeedDataAsync()
+ {
+ _logger.LogDebug($"Executing database seed...");
+
+ await _dataSeeder.SeedAsync(new DataSeedContext().WithProperty(CMSPluginDbProperties.ConnectionStringName, CMSPluginDbProperties.ConnectionStringName));
+ }
+
+ /// <summary>
+ /// Adds the initial migration if not exist.
+ /// </summary>
+ /// <returns></returns>
+ private bool AddInitialMigrationIfNotExist()
+ {
+ try
+ {
+ if (!DbMigrationsProjectExists())
+ {
+ return false;
+ }
+ }
+ catch (Exception)
+ {
+ return false;
+ }
+
+ try
+ {
+ if (!MigrationsFolderExists())
+ {
+ AddInitialMigration();
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+ }
+ catch (Exception e)
+ {
+ _logger.LogWarning("Couldn't determinate if any migrations exist : " + e.Message);
+ return false;
+ }
+ }
+
+ /// <summary>
+ /// Databases the migrations project exists.
+ /// </summary>
+ /// <returns></returns>
+ private bool DbMigrationsProjectExists()
+ {
+ var dbMigrationsProjectFolder = GetEntityFrameworkCoreProjectFolderPath();
+
+ return dbMigrationsProjectFolder != null;
+ }
+
+ /// <summary>
+ /// Migrationses the folder exists.
+ /// </summary>
+ /// <returns></returns>
+ private bool MigrationsFolderExists()
+ {
+ var dbMigrationsProjectFolder = GetEntityFrameworkCoreProjectFolderPath();
+
+ return Directory.Exists(Path.Combine(dbMigrationsProjectFolder, "Migrations"));
+ }
+
+ /// <summary>
+ /// Adds the initial migration.
+ /// </summary>
+ /// <exception cref="System.Exception">Couldn't run ABP CLI...</exception>
+ private void AddInitialMigration()
+ {
+ _logger.LogDebug("Creating initial migration...");
+
+ string argumentPrefix;
+ string fileName;
+
+ if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX) || RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+ {
+ argumentPrefix = "-c";
+ fileName = "/bin/bash";
+ }
+ else
+ {
+ argumentPrefix = "/C";
+ fileName = "cmd.exe";
+ }
+
+ var procStartInfo = new ProcessStartInfo(fileName,
+ $"{argumentPrefix} \"abp create-migration-and-run-migrator \"{GetEntityFrameworkCoreProjectFolderPath()}\"\""
+ );
+
+ try
+ {
+ Process.Start(procStartInfo);
+ }
+ catch (Exception)
+ {
+ throw new Exception("Couldn't run ABP CLI...");
+ }
+ }
+
+ /// <summary>
+ /// Gets the entity framework core project folder path.
+ /// </summary>
+ /// <returns></returns>
+ /// <exception cref="System.Exception">Solution folder not found!</exception>
+ private string GetEntityFrameworkCoreProjectFolderPath()
+ {
+ var slnDirectoryPath = GetSolutionDirectoryPath();
+
+ if (slnDirectoryPath == null)
+ {
+ throw new Exception("Solution folder not found!");
+ }
+
+ var srcDirectoryPath = Path.Combine(slnDirectoryPath, "src");
+
+ return Directory.GetDirectories(srcDirectoryPath)
+ .FirstOrDefault(d => d.EndsWith(".EntityFrameworkCore"));
+ }
+
+ /// <summary>
+ /// Gets the solution directory path.
+ /// </summary>
+ /// <returns></returns>
+ private string GetSolutionDirectoryPath()
+ {
+ var currentDirectory = new DirectoryInfo(Directory.GetCurrentDirectory());
+
+ while (Directory.GetParent(currentDirectory.FullName) != null)
+ {
+ currentDirectory = Directory.GetParent(currentDirectory.FullName);
+
+ if (Directory.GetFiles(currentDirectory.FullName).FirstOrDefault(f => f.EndsWith(".sln")) != null)
+ {
+ return currentDirectory.FullName;
+ }
+ }
+
+ return null;
+ }
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain/Data/ICMSPluginDapperRepository.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain/Data/ICMSPluginDapperRepository.cs"
new file mode 100644
index 0000000..7b8644b
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain/Data/ICMSPluginDapperRepository.cs"
@@ -0,0 +1,22 @@
+using System.Data;
+using Volo.Abp.DependencyInjection;
+
+namespace CMS.Plugin.WareCmsUtilityApi.Domain.Data;
+
+/// <summary>
+/// Dapper浠撳偍
+/// </summary>
+public interface ICMSPluginDapperRepository : ITransientDependency
+{
+ /// <summary>
+ /// Gets the database connection asynchronous.
+ /// </summary>
+ /// <returns></returns>
+ Task<IDbConnection> GetDbConnectionAsync();
+
+ /// <summary>
+ /// Gets the database transaction asynchronous.
+ /// </summary>
+ /// <returns></returns>
+ Task<IDbTransaction> GetDbTransactionAsync();
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain/Data/ICMSPluginDbSchemaMigrator.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain/Data/ICMSPluginDbSchemaMigrator.cs"
new file mode 100644
index 0000000..e49363e
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain/Data/ICMSPluginDbSchemaMigrator.cs"
@@ -0,0 +1,12 @@
+namespace CMS.Plugin.WareCmsUtilityApi.Domain.Data;
+
+/// <summary>
+/// 鏁版嵁搴撴灦鏋勮縼绉诲櫒
+/// </summary>
+public interface ICMSPluginDbSchemaMigrator
+{
+ /// <summary>
+ /// Migrates the asynchronous.
+ /// </summary>
+ Task MigrateAsync();
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain/Data/NullCMSPluginDbSchemaMigrator.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain/Data/NullCMSPluginDbSchemaMigrator.cs"
new file mode 100644
index 0000000..383d936
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain/Data/NullCMSPluginDbSchemaMigrator.cs"
@@ -0,0 +1,16 @@
+using Volo.Abp.DependencyInjection;
+
+namespace CMS.Plugin.WareCmsUtilityApi.Domain.Data;
+
+/// <summary>
+/// This is used if database provider does't define
+/// ICMSDbSchemaMigrator implementation.
+/// </summary>
+public class NullCMSPluginDbSchemaMigrator : ICMSPluginDbSchemaMigrator, ITransientDependency
+{
+ /// <inheritdoc />
+ public Task MigrateAsync()
+ {
+ return Task.CompletedTask;
+ }
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain/EventHandlers/SampleEventHandler.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain/EventHandlers/SampleEventHandler.cs"
new file mode 100644
index 0000000..cb08b6e
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain/EventHandlers/SampleEventHandler.cs"
@@ -0,0 +1,17 @@
+using CMS.Plugin.WareCmsUtilityApi.Domain.Shared.Samples;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.EventBus.Distributed;
+
+namespace CMS.Plugin.WareCmsUtilityApi.Domain.EventHandlers;
+
+/// <summary>
+/// Sample浜嬩欢澶勭悊绋嬪簭
+/// </summary>
+public class SampleEventHandler : IDistributedEventHandler<SampleEto>, ITransientDependency
+{
+ /// <inheritdoc />
+ public Task HandleEventAsync(SampleEto eventData)
+ {
+ return Task.CompletedTask;
+ }
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/FodyWeavers.xml" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain/FodyWeavers.xml"
similarity index 100%
rename from "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/FodyWeavers.xml"
rename to "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain/FodyWeavers.xml"
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/Properties/AssemblyInfo.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain/Properties/AssemblyInfo.cs"
similarity index 100%
rename from "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Domain/Properties/AssemblyInfo.cs"
rename to "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain/Properties/AssemblyInfo.cs"
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain/Samples/ISampleRepository.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain/Samples/ISampleRepository.cs"
new file mode 100644
index 0000000..4052fd1
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain/Samples/ISampleRepository.cs"
@@ -0,0 +1,54 @@
+using Volo.Abp.Domain.Repositories;
+using Volo.Abp.Specifications;
+
+namespace CMS.Plugin.WareCmsUtilityApi.Domain.Samples;
+
+/// <summary>
+/// Sample浠撳偍
+/// </summary>
+public interface ISampleRepository : IBasicRepository<Sample, Guid>
+{
+ /// <summary>
+ /// Finds the by name asynchronous.
+ /// </summary>
+ /// <param name="name">The name.</param>
+ /// <param name="cancellationToken">The cancellation token.</param>
+ /// <returns></returns>
+ Task<Sample> FindByNameAsync(string name, CancellationToken cancellationToken = default);
+
+ /// <summary>
+ /// Names the exist asynchronous.
+ /// </summary>
+ /// <param name="name">The name.</param>
+ /// <param name="id">The identifier.</param>
+ /// <returns></returns>
+ Task<bool> NameExistAsync(string name, Guid? id = null);
+
+ /// <summary>
+ /// Gets the maximum sort asynchronous.
+ /// </summary>
+ /// <returns></returns>
+ Task<int> GetMaxSortAsync();
+
+ /// <summary>
+ /// Gets the list asynchronous.
+ /// </summary>
+ /// <param name="sorting">The sorting.</param>
+ /// <param name="maxResultCount">The maximum result count.</param>
+ /// <param name="skipCount">The skip count.</param>
+ /// <param name="filter">The filter.</param>
+ /// <param name="specification">The specification.</param>
+ /// <param name="includeDetails">if set to <c>true</c> [include details].</param>
+ /// <param name="cancellationToken">The cancellation token.</param>
+ /// <returns></returns>
+ Task<List<Sample>> GetListAsync(string sorting = null, int maxResultCount = int.MaxValue, int skipCount = 0, string filter = null, Specification<Sample> specification = null, bool includeDetails = false, CancellationToken cancellationToken = default);
+
+ /// <summary>
+ /// Gets the count asynchronous.
+ /// </summary>
+ /// <param name="filter">The filter.</param>
+ /// <param name="specification">The specification.</param>
+ /// <param name="cancellationToken">The cancellation token.</param>
+ /// <returns></returns>
+ Task<long> GetCountAsync(string filter = null, Specification<Sample> specification = null, CancellationToken cancellationToken = default);
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain/Samples/Sample.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain/Samples/Sample.cs"
new file mode 100644
index 0000000..6b34d4c
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain/Samples/Sample.cs"
@@ -0,0 +1,95 @@
+using CMS.Plugin.WareCmsUtilityApi.Domain.Shared.Samples;
+using Volo.Abp;
+using Volo.Abp.Domain.Entities.Auditing;
+
+namespace CMS.Plugin.WareCmsUtilityApi.Domain.Samples
+{
+ /// <summary>
+ /// Sample
+ /// </summary>
+ public class Sample : FullAuditedAggregateRoot<Guid>
+ {
+ /// <summary>
+ /// Initializes a new instance of the <see cref="Sample"/> class.
+ /// </summary>
+ protected Sample()
+ {
+ }
+
+ /// <summary>
+ /// Initializes a new instance of the <see cref="Sample"/> class.
+ /// </summary>
+ /// <param name="id">The identifier.</param>
+ /// <param name="code">The code.</param>
+ /// <param name="name">The name.</param>
+ /// <param name="sort">The sort.</param>
+ /// <param name="remark">The remark.</param>
+ public Sample(Guid id, string code, string name, int sort = 0, string remark = null) : base(id)
+ {
+ Code = Check.NotNullOrWhiteSpace(code, "缂栧彿", SampleConsts.MaxCodeLength);
+ Name = Check.NotNullOrWhiteSpace(name, "鍚嶇О", SampleConsts.MaxNameLength);
+ Sort = sort;
+ Remark = Check.Length(remark, "澶囨敞", SampleConsts.MaxRemarkLength);
+ }
+
+ /// <summary>
+ /// 缂栧彿
+ /// </summary>
+ public virtual string Code { get; protected set; }
+
+ /// <summary>
+ /// 鍚嶇О
+ /// </summary>
+ public virtual string Name { get; protected set; }
+
+ /// <summary>
+ /// 鎺掑簭
+ /// </summary>
+ public virtual int Sort { get; protected set; }
+
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+ public virtual string Remark { get; protected set; }
+
+ /// <summary>
+ /// 鏄惁绂佺敤
+ /// </summary>
+ public virtual bool? IsDisabled { get; protected set; }
+
+ /// <summary>
+ /// Updates the specified code.
+ /// </summary>
+ /// <param name="code">The code.</param>
+ /// <param name="name">The name.</param>
+ /// <param name="remark">The remark.</param>
+ public virtual void Update(string code, string name, string remark = null, bool? isDisabled = null)
+ {
+ Code = Check.NotNullOrWhiteSpace(code, "缂栧彿", SampleConsts.MaxCodeLength);
+ Name = Check.NotNullOrWhiteSpace(name, "鍚嶇О", SampleConsts.MaxNameLength);
+ Remark = Check.Length(remark, "澶囨敞", SampleConsts.MaxRemarkLength);
+ IsDisabled = isDisabled ?? IsDisabled;
+ }
+
+ /// <summary>
+ /// Adjusts the sort.
+ /// </summary>
+ /// <param name="sort">The sort.</param>
+ public void AdjustSort(int sort)
+ {
+ Sort = sort;
+ }
+
+ /// <summary>
+ /// Clones the specified create.
+ /// </summary>
+ /// <param name="create">The create.</param>
+ /// <param name="name">The name.</param>
+ /// <param name="i">The i.</param>
+ /// <returns></returns>
+ public Sample Clone(Guid create, string name, int i)
+ {
+ return new Sample(create, Code, name, i, Remark);
+ }
+ }
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain/Samples/SampleDataSeedContributor.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain/Samples/SampleDataSeedContributor.cs"
new file mode 100644
index 0000000..d7993e5
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain/Samples/SampleDataSeedContributor.cs"
@@ -0,0 +1,79 @@
+using Volo.Abp.Data;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Guids;
+using Volo.Abp.Uow;
+
+namespace CMS.Plugin.WareCmsUtilityApi.Domain.Samples
+{
+ /// <summary>
+ /// Sample绉嶅瓙鏁版嵁鎻愪緵绋嬪簭
+ /// </summary>
+ public class SampleDataSeedContributor : IDataSeedContributor, ITransientDependency
+ {
+ private readonly IUnitOfWorkManager _unitOfWorkManager;
+ private readonly ISampleRepository _sampleRepository;
+ private readonly IGuidGenerator _guidGenerator;
+
+ /// <summary>
+ /// Initializes a new instance of the <see cref="SampleDataSeedContributor"/> class.
+ /// </summary>
+ /// <param name="unitOfWorkManager">The unit of work manager.</param>
+ /// <param name="guidGenerator">The unique identifier generator.</param>
+ /// <param name="sampleRepository">The work section repository.</param>
+ public SampleDataSeedContributor(IUnitOfWorkManager unitOfWorkManager, IGuidGenerator guidGenerator, ISampleRepository sampleRepository)
+ {
+ _unitOfWorkManager = unitOfWorkManager;
+ _sampleRepository = sampleRepository;
+ _guidGenerator = guidGenerator;
+ }
+
+ /// <inheritdoc />
+ public async Task SeedAsync(DataSeedContext context)
+ {
+ if (context.Properties.ContainsKey(CMSPluginDbProperties.ConnectionStringName) && context.Properties[CMSPluginDbProperties.ConnectionStringName]?.ToString() == CMSPluginDbProperties.ConnectionStringName)
+ {
+ try
+ {
+ //using var unitofWork = _unitOfWorkManager.Begin(requiresNew: true);
+ //await unitofWork.SaveChangesAsync();
+ }
+ catch (Exception ex)
+ {
+ Console.WriteLine(ex.Message);
+ }
+ }
+
+ if (context.Properties.ContainsKey("SeedTestData") && context.Properties["SeedTestData"]?.ToString() == "SeedTestData")
+ {
+ try
+ {
+ await SeedSampleDataAsync();
+ }
+ catch (Exception e)
+ {
+ Console.WriteLine(e.Message);
+ }
+ }
+ }
+
+ /// <summary>
+ /// Seeds the work section data asynchronous.
+ /// </summary>
+ private async Task SeedSampleDataAsync()
+ {
+ using var unitofWork = _unitOfWorkManager.Begin(requiresNew: true);
+ if (await _sampleRepository.GetCountAsync() == 0)
+ {
+ var Samples = new List<Sample>();
+ for (int i = 1; i <= 80; i++)
+ {
+ var sample = new Sample(_guidGenerator.Create(), $"Sample_Code{i}", $"Sample_Name{i}", i, $"Sample_Remark{i}");
+ Samples.Add(sample);
+ }
+
+ await _sampleRepository.InsertManyAsync(Samples);
+ await unitofWork.SaveChangesAsync();
+ }
+ }
+ }
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain/Samples/SampleSpecification.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain/Samples/SampleSpecification.cs"
new file mode 100644
index 0000000..60015d0
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain/Samples/SampleSpecification.cs"
@@ -0,0 +1,41 @@
+using System.Linq.Expressions;
+
+namespace CMS.Plugin.WareCmsUtilityApi.Domain.Samples
+{
+ /// <summary>
+ /// Sample瑙勭害
+ /// </summary>
+ public class SampleSpecification : Volo.Abp.Specifications.Specification<Sample>
+ {
+ private readonly string _name;
+
+ /// <summary>
+ /// Initializes a new instance of the <see cref="SampleSpecification"/> class.
+ /// </summary>
+ public SampleSpecification()
+ {
+ }
+
+ /// <summary>
+ /// Initializes a new instance of the <see cref="SampleSpecification"/> class.
+ /// </summary>
+ /// <param name="name">The name.</param>
+ public SampleSpecification(string name = null)
+ {
+ _name = name;
+ }
+
+ /// <inheritdoc />
+ public override Expression<Func<Sample, bool>> ToExpression()
+ {
+ Expression<Func<Sample, bool>> expression = c => 1 == 1;
+
+ if (_name != null)
+ {
+ expression = expression.And(c => c.Name == _name);
+ }
+
+ return expression;
+ }
+ }
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain/Settings/CMSPluginSettingDefinitionProvider.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain/Settings/CMSPluginSettingDefinitionProvider.cs"
new file mode 100644
index 0000000..e604b11
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.Domain/Settings/CMSPluginSettingDefinitionProvider.cs"
@@ -0,0 +1,27 @@
+using CMS.Plugin.WareCmsUtilityApi.Abstractions;
+using CMS.Plugin.WareCmsUtilityApi.Domain.Shared.Localization;
+using Volo.Abp.Localization;
+using Volo.Abp.Settings;
+
+namespace CMS.Plugin.WareCmsUtilityApi.Domain.Settings;
+
+/// <summary>
+/// 璁剧疆瀹氫箟鎻愪緵绋嬪簭
+/// </summary>
+public class CMSPluginSettingDefinitionProvider : SettingDefinitionProvider
+{
+ public override void Define(ISettingDefinitionContext context)
+ {
+ context.Add(new SettingDefinition(CMSPluginWareCmsUtilityApiSettings.PluginState, "1", L($"DisplayName:{CMSPluginWareCmsUtilityApiSettings.PluginState}"), isInherited: true));
+ }
+
+ /// <summary>
+ /// ls the specified name.
+ /// </summary>
+ /// <param name="name">The name.</param>
+ /// <returns></returns>
+ private static LocalizableString L(string name)
+ {
+ return LocalizableString.Create<WareCmsUtilityApiResource>(name);
+ }
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore/CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore.csproj" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore/CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore.csproj"
new file mode 100644
index 0000000..408b235
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore/CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore.csproj"
@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+ <Import Project="../../common.props" />
+ <Import Project="../../configureawait.props" />
+
+ <PropertyGroup>
+ <TargetFramework>net6.0</TargetFramework>
+ </PropertyGroup>
+
+ <ItemGroup>
+ <PackageReference Include="Volo.Abp.Dapper" Version="$(ABPPackageVersion)" />
+ <PackageReference Include="Volo.Abp.EntityFrameworkCore" Version="$(ABPPackageVersion)" />
+ </ItemGroup>
+
+ <ItemGroup>
+ <ProjectReference Include="..\CMS.Plugin.WareCmsUtilityApi.Domain\CMS.Plugin.WareCmsUtilityApi.Domain.csproj" />
+ </ItemGroup>
+
+</Project>
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore/CMSPluginDapperRepository.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore/CMSPluginDapperRepository.cs"
new file mode 100644
index 0000000..feafb83
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore/CMSPluginDapperRepository.cs"
@@ -0,0 +1,18 @@
+using CMS.Plugin.WareCmsUtilityApi.Domain.Data;
+using Volo.Abp.Domain.Repositories.Dapper;
+using Volo.Abp.EntityFrameworkCore;
+
+namespace CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore;
+
+/// <inheritdoc />
+public class CMSPluginDapperRepository : DapperRepository<ICMSPluginDbContext>, ICMSPluginDapperRepository
+{
+ /// <summary>
+ /// Initializes a new instance of the <see cref="CMSPluginDapperRepository"/> class.
+ /// </summary>
+ /// <param name="dbContextProvider">The database context provider.</param>
+ public CMSPluginDapperRepository(IDbContextProvider<ICMSPluginDbContext> dbContextProvider)
+ : base(dbContextProvider)
+ {
+ }
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore/CMSPluginDbSchemaMigrator.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore/CMSPluginDbSchemaMigrator.cs"
new file mode 100644
index 0000000..f257af8
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore/CMSPluginDbSchemaMigrator.cs"
@@ -0,0 +1,37 @@
+using CMS.Plugin.WareCmsUtilityApi.Domain.Data;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Volo.Abp.DependencyInjection;
+
+namespace CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore;
+
+/// <inheritdoc />
+public class CMSPluginDbSchemaMigrator : ICMSPluginDbSchemaMigrator, ITransientDependency
+{
+ private readonly IServiceProvider _serviceProvider;
+ private readonly ILogger<CMSPluginDbSchemaMigrator> _logger;
+
+ /// <summary>
+ /// Initializes a new instance of the <see cref="CMSPluginDbSchemaMigrator"/> class.
+ /// </summary>
+ /// <param name="serviceProvider">The service provider.</param>
+ public CMSPluginDbSchemaMigrator(IServiceProvider serviceProvider, ILogger<CMSPluginDbSchemaMigrator> logger)
+ {
+ _serviceProvider = serviceProvider;
+ _logger = logger;
+ }
+
+ /// <inheritdoc />
+ public async Task MigrateAsync()
+ {
+ /* We intentionally resolving the CMSDbContext
+ * from IServiceProvider (instead of directly injecting it)
+ * to properly get the connection string of the current tenant in the
+ * current scope.
+ */
+ var database = _serviceProvider.GetRequiredService<ICMSPluginDbContext>().Database;
+ _logger.LogInformation($"Start database {database.GetDbConnection().Database} migrate");
+ await database.MigrateAsync();
+ }
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore/CMSPluginEfCoreEntityExtensionMappings.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore/CMSPluginEfCoreEntityExtensionMappings.cs"
new file mode 100644
index 0000000..5c310f4
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore/CMSPluginEfCoreEntityExtensionMappings.cs"
@@ -0,0 +1,47 @@
+using CMS.Plugin.WareCmsUtilityApi.Domain.Shared;
+using Volo.Abp.Threading;
+
+namespace CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore;
+
+/// <summary>
+/// EfCore瀹炰綋鎵╁睍
+/// </summary>
+public static class CMSPluginEfCoreEntityExtensionMappings
+{
+ private static readonly OneTimeRunner OneTimeRunner = new OneTimeRunner();
+
+ /// <summary>
+ /// Configures this instance.
+ /// </summary>
+ public static void Configure()
+ {
+ CMSPluginModuleExtensionConfigurator.Configure();
+
+ OneTimeRunner.Run(() =>
+ {
+ /* You can configure extra properties for the
+ * entities defined in the modules used by your application.
+ *
+ * This class can be used to map these extra properties to table fields in the database.
+ *
+ * USE THIS CLASS ONLY TO CONFIGURE EF CORE RELATED MAPPING.
+ * USE CMSModuleExtensionConfigurator CLASS (in the Domain.Shared project)
+ * FOR A HIGH LEVEL API TO DEFINE EXTRA PROPERTIES TO ENTITIES OF THE USED MODULES
+ *
+ * Example: Map a property to a table field:
+
+ ObjectExtensionManager.Instance
+ .MapEfCoreProperty<Sample, string>(
+ "MyProperty",
+ (entityBuilder, propertyBuilder) =>
+ {
+ propertyBuilder.HasMaxLength(128);
+ }
+ );
+
+ * See the documentation for more:
+ * https://docs.abp.io/en/abp/latest/Customizing-Application-Modules-Extending-Entities
+ */
+ });
+ }
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore/CMSPluginEntityFrameworkCoreModule.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore/CMSPluginEntityFrameworkCoreModule.cs"
new file mode 100644
index 0000000..da40a49
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore/CMSPluginEntityFrameworkCoreModule.cs"
@@ -0,0 +1,26 @@
+using CMS.Plugin.WareCmsUtilityApi.Domain;
+using Volo.Abp.EntityFrameworkCore;
+using Volo.Abp.Modularity;
+
+namespace CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore;
+
+/// <summary>
+/// EntityFrameworkCore妯″潡
+/// </summary>
+[DependsOn(
+ typeof(CMSPluginDomainModule),
+ typeof(AbpEntityFrameworkCoreModule)
+ )]
+public class CMSPluginEntityFrameworkCoreModule : AbpModule
+{
+ /// <inheritdoc />
+ public override void PreConfigureServices(ServiceConfigurationContext context)
+ {
+ CMSPluginEfCoreEntityExtensionMappings.Configure();
+ }
+
+ /// <inheritdoc />
+ public override void ConfigureServices(ServiceConfigurationContext context)
+ {
+ }
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.Sample.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.Sample.cs"
new file mode 100644
index 0000000..5e7c9e6
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.Sample.cs"
@@ -0,0 +1,58 @@
+using CMS.Plugin.WareCmsUtilityApi.Domain;
+using CMS.Plugin.WareCmsUtilityApi.Domain.Samples;
+using CMS.Plugin.WareCmsUtilityApi.Domain.Shared.Samples;
+using Microsoft.EntityFrameworkCore;
+using Volo.Abp;
+using Volo.Abp.EntityFrameworkCore.Modeling;
+
+namespace CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore.Extensions;
+
+/// <summary>
+/// EfCore鎵╁睍
+/// </summary>
+public static partial class CMSPluginEfCoreExtensions
+{
+ /// <summary>
+ /// Includes the details.
+ /// </summary>
+ /// <param name="queryable">The queryable.</param>
+ /// <param name="include">if set to <c>true</c> [include].</param>
+ /// <returns></returns>
+ public static IQueryable<Sample> IncludeDetails(this IQueryable<Sample> queryable, bool include = true)
+ {
+ if (!include)
+ {
+ return queryable;
+ }
+
+ return queryable;
+ }
+
+ /// <summary>
+ /// Configures the sample.
+ /// </summary>
+ /// <param name="builder">The builder.</param>
+ public static void ConfigureSample(this ModelBuilder builder)
+ {
+ Check.NotNull(builder, nameof(builder));
+
+ builder.Entity<Sample>(b =>
+ {
+ //Configure table & schema name
+ b.ToTable((CMSPluginDbProperties.DbTablePrefix + "_Samples").ToLower(), CMSPluginDbProperties.DbSchema).HasComment("Sample");
+
+ b.ConfigureByConvention();
+
+ //Properties
+ b.Property(x => x.Code).HasMaxLength(SampleConsts.MaxCodeLength).IsRequired().HasComment("缂栫爜");
+ b.Property(x => x.Name).HasMaxLength(SampleConsts.MaxNameLength).IsRequired().HasComment("鍚嶇О");
+ b.Property(x => x.Sort).HasComment("鎺掑簭");
+ b.Property(x => x.IsDisabled).IsRequired(false).HasComment("鏄惁绂佺敤");
+ b.Property(x => x.Remark).HasMaxLength(SampleConsts.MaxRemarkLength).IsRequired(false).HasComment("澶囨敞");
+
+ b.HasIndex(u => u.Name);
+
+ b.ApplyObjectExtensionMappings();
+ });
+ }
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.EntityFrameworkCore/FodyWeavers.xml" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore/FodyWeavers.xml"
similarity index 100%
rename from "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.EntityFrameworkCore/FodyWeavers.xml"
rename to "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore/FodyWeavers.xml"
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore/ICMSPluginDbContext.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore/ICMSPluginDbContext.cs"
new file mode 100644
index 0000000..4e394a9
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore/ICMSPluginDbContext.cs"
@@ -0,0 +1,14 @@
+using CMS.Plugin.WareCmsUtilityApi.Domain;
+using Volo.Abp.Data;
+using Volo.Abp.EntityFrameworkCore;
+
+namespace CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore
+{
+ /// <summary>
+ /// 鏁版嵁搴撲笂涓嬫枃
+ /// </summary>
+ [ConnectionStringName(CMSPluginDbProperties.ConnectionStringName)]
+ public interface ICMSPluginDbContext : IEfCoreDbContext
+ {
+ }
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Properties/AssemblyInfo.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore/Properties/AssemblyInfo.cs"
similarity index 100%
rename from "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Properties/AssemblyInfo.cs"
rename to "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore/Properties/AssemblyInfo.cs"
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore/Repositories/EfCoreSampleRepository.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore/Repositories/EfCoreSampleRepository.cs"
new file mode 100644
index 0000000..628ee4d
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore/Repositories/EfCoreSampleRepository.cs"
@@ -0,0 +1,79 @@
+using System.Linq.Dynamic.Core;
+using CMS.Plugin.WareCmsUtilityApi.Domain.Samples;
+using CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore.Extensions;
+using Microsoft.EntityFrameworkCore;
+using Volo.Abp.Domain.Repositories.EntityFrameworkCore;
+using Volo.Abp.EntityFrameworkCore;
+using Volo.Abp.Specifications;
+
+namespace CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore.Repositories;
+
+/// <inheritdoc />
+public class EfCoreSampleRepository : EfCoreRepository<ICMSPluginDbContext, Sample, Guid>, ISampleRepository
+{
+ /// <summary>
+ /// Initializes a new instance of the <see cref="EfCoreSampleRepository"/> class.
+ /// </summary>
+ /// <param name="dbContextProvider">The database context provider.</param>
+ public EfCoreSampleRepository(IDbContextProvider<ICMSPluginDbContext> dbContextProvider)
+ : base(dbContextProvider)
+ {
+ }
+
+ /// <inheritdoc />
+ public virtual async Task<Sample> FindByNameAsync(string name, CancellationToken cancellationToken = default)
+ {
+ return await (await GetDbSetAsync())
+ .IncludeDetails()
+ .OrderBy(t => t.Sort)
+ .FirstOrDefaultAsync(t => t.Name == name, GetCancellationToken(cancellationToken));
+ }
+
+ /// <inheritdoc />
+ public async Task<bool> NameExistAsync(string name, Guid? id = null)
+ {
+ return await (await GetDbSetAsync()).WhereIf(id.HasValue, p => p.Id != id).AnyAsync(x => x.Name == name);
+ }
+
+ /// <inheritdoc />
+ public async Task<int> GetMaxSortAsync()
+ {
+ var hasAny = await (await GetQueryableAsync()).AnyAsync();
+ if (!hasAny)
+ {
+ return 1;
+ }
+
+ var sort = await (await GetQueryableAsync()).MaxAsync(x => x.Sort);
+ return sort + 1;
+ }
+
+ /// <inheritdoc />
+ public async Task<List<Sample>> GetListAsync(string sorting = null, int maxResultCount = int.MaxValue, int skipCount = 0, string filter = null, Specification<Sample> specification = null, bool includeDetails = false, CancellationToken cancellationToken = default)
+ {
+ specification ??= new SampleSpecification();
+ return await (await GetDbSetAsync())
+ .IncludeDetails(includeDetails)
+ .Where(specification.ToExpression())
+ .WhereIf(!filter.IsNullOrWhiteSpace(), u => u.Name.Contains(filter))
+ .OrderBy(sorting.IsNullOrEmpty() ? nameof(Sample.Sort) : sorting)
+ .PageBy(skipCount, maxResultCount)
+ .ToListAsync(GetCancellationToken(cancellationToken));
+ }
+
+ /// <inheritdoc />
+ public async Task<long> GetCountAsync(string filter = null, Specification<Sample> specification = null, CancellationToken cancellationToken = default)
+ {
+ specification ??= new SampleSpecification();
+ return await (await GetQueryableAsync())
+ .Where(specification.ToExpression())
+ .WhereIf(!filter.IsNullOrWhiteSpace(), u => u.Name.Contains(filter))
+ .CountAsync(cancellationToken: GetCancellationToken(cancellationToken));
+ }
+
+ /// <inheritdoc />
+ public override async Task<IQueryable<Sample>> WithDetailsAsync()
+ {
+ return (await GetQueryableAsync()).IncludeDetails();
+ }
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore/appsettings.json" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore/appsettings.json"
new file mode 100644
index 0000000..2e2d81f
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore/appsettings.json"
@@ -0,0 +1,5 @@
+{
+ "ConnectionStrings": {
+ "Default": "Server=127.0.0.1;Database=CMS.Plugin.WareCmsUtilityApi;User ID=root;Password=123456"
+ }
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.MySQL/CMS.Plugin.WareCmsUtilityApi.MySQL.csproj" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.MySQL/CMS.Plugin.WareCmsUtilityApi.MySQL.csproj"
new file mode 100644
index 0000000..8422de0
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.MySQL/CMS.Plugin.WareCmsUtilityApi.MySQL.csproj"
@@ -0,0 +1,30 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+ <Import Project="../../common.props" />
+ <Import Project="../../configureawait.props" />
+
+ <PropertyGroup>
+ <TargetFramework>net6.0</TargetFramework>
+
+ </PropertyGroup>
+
+ <ItemGroup>
+ <PackageReference Include="Volo.Abp.EntityFrameworkCore.MySQL" Version="$(ABPPackageVersion)" />
+ </ItemGroup>
+
+ <ItemGroup>
+ <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.5">
+ <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+ <PrivateAssets>compile; contentFiles; build; buildMultitargeting; buildTransitive; analyzers; native</PrivateAssets>
+ </PackageReference>
+ </ItemGroup>
+
+ <ItemGroup>
+ <ProjectReference Include="..\CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore\CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore.csproj" />
+ </ItemGroup>
+
+ <ItemGroup>
+ <Folder Include="Migrations\" />
+ </ItemGroup>
+
+</Project>
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.MySQL/CMSPluginDbContext.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.MySQL/CMSPluginDbContext.cs"
new file mode 100644
index 0000000..a52c64e
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.MySQL/CMSPluginDbContext.cs"
@@ -0,0 +1,48 @@
+using CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore.Extensions;
+using CMS.Plugin.WareCmsUtilityApi.Domain;
+using CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
+using Volo.Abp.Data;
+using Volo.Abp.EntityFrameworkCore;
+using Volo.Abp.EntityFrameworkCore.Modeling;
+
+namespace CMS.Plugin.WareCmsUtilityApi.MySQL;
+
+/// <summary>
+/// 鏁版嵁搴撲笂涓嬫枃
+/// </summary>
+[ConnectionStringName(CMSPluginDbProperties.ConnectionStringName)]
+public class CMSPluginDbContext : AbpDbContext<CMSPluginDbContext>, ICMSPluginDbContext
+{
+ /* Add DbSet properties for your Aggregate Roots / Entities here. */
+
+ /// <summary>
+ /// Initializes a new instance of the <see cref="CMSPluginDbContext"/> class.
+ /// </summary>
+ /// <param name="options">The options.</param>
+ public CMSPluginDbContext(DbContextOptions<CMSPluginDbContext> options)
+ : base(options)
+ {
+ }
+
+ /// <inheritdoc />
+ protected override void OnModelCreating(ModelBuilder builder)
+ {
+ base.OnModelCreating(builder);
+
+ /* Include modules to your migration db context */
+
+ builder.ConfigureSample();
+
+ /* Configure your own tables/entities inside here */
+
+ //builder.Entity<YourEntity>(b =>
+ //{
+ // b.ToTable(CMSPluginDbProperties.DbTablePrefix + "YourEntities", CMSPluginDbProperties.DbSchema);
+ // b.ConfigureByConvention(); //auto configure for the base class props
+ // //...
+ //});
+
+ builder.TryConfigureObjectExtensions<CMSPluginDbContext>();
+ }
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.MySQL/CMSPluginDbContextFactory.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.MySQL/CMSPluginDbContextFactory.cs"
new file mode 100644
index 0000000..a352a48
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.MySQL/CMSPluginDbContextFactory.cs"
@@ -0,0 +1,43 @@
+using CMS.Plugin.WareCmsUtilityApi.Domain;
+using CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Design;
+using Microsoft.Extensions.Configuration;
+
+namespace CMS.Plugin.WareCmsUtilityApi.MySQL;
+
+/// <summary>
+/// This class is needed for EF Core console commands
+/// (like Add-Migration and Update-Database commands)
+/// </summary>
+public class CMSPluginDbContextFactory : IDesignTimeDbContextFactory<CMSPluginDbContext>
+{
+ /// <summary>
+ /// Creates a new instance of a derived context.
+ /// </summary>
+ /// <param name="args">Arguments provided by the design-time service.</param>
+ public CMSPluginDbContext CreateDbContext(string[] args)
+ {
+ CMSPluginEfCoreEntityExtensionMappings.Configure();
+
+ var configuration = BuildConfiguration();
+
+ var builder = new DbContextOptionsBuilder<CMSPluginDbContext>()
+ .UseMySql(configuration.GetConnectionString("Default"), MySqlServerVersion.LatestSupportedServerVersion, x => x.MigrationsHistoryTable(CMSPluginDbProperties.MigrationsHistoryTable, CMSPluginDbProperties.DbSchema));
+
+ return new CMSPluginDbContext(builder.Options);
+ }
+
+ /// <summary>
+ /// Builds the configuration.
+ /// </summary>
+ /// <returns></returns>
+ private static IConfigurationRoot BuildConfiguration()
+ {
+ var builder = new ConfigurationBuilder()
+ .SetBasePath(Path.Combine(Directory.GetCurrentDirectory(), "../CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore/"))
+ .AddJsonFile("appsettings.json", optional: false);
+
+ return builder.Build();
+ }
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.MySQL/CMSPluginMySQLModule.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.MySQL/CMSPluginMySQLModule.cs"
new file mode 100644
index 0000000..887737d
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.MySQL/CMSPluginMySQLModule.cs"
@@ -0,0 +1,42 @@
+using CMS.Plugin.WareCmsUtilityApi.Domain;
+using CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore;
+using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp.EntityFrameworkCore;
+using Volo.Abp.Modularity;
+
+namespace CMS.Plugin.WareCmsUtilityApi.MySQL;
+
+/// <summary>
+/// EntityFrameworkCore妯″潡
+/// </summary>
+[DependsOn(typeof(CMSPluginEntityFrameworkCoreModule))]
+public class CMSPluginMySQLModule : AbpModule
+{
+ /// <inheritdoc />
+ public override void PreConfigureServices(ServiceConfigurationContext context)
+ {
+ CMSPluginEfCoreEntityExtensionMappings.Configure();
+ }
+
+ /// <inheritdoc />
+ public override void ConfigureServices(ServiceConfigurationContext context)
+ {
+ context.Services.AddAbpDbContext<CMSPluginDbContext>(options =>
+ {
+ /* Remove "includeAllEntities: true" to create
+ * default repositories only for aggregate roots */
+ //options.AddDefaultRepositories(includeAllEntities: true);
+ });
+
+ Configure<AbpDbContextOptions>(options =>
+ {
+ /* The main point to change your DBMS.
+ * See also CMSMigrationsDbContextFactory for EF Core tooling. */
+ options.UseMySQL(x =>
+ {
+ x.MigrationsHistoryTable(CMSPluginDbProperties.MigrationsHistoryTable, CMSPluginDbProperties.DbSchema);
+ //x.EnableRetryOnFailure();
+ });
+ });
+ }
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.MySQL/FodyWeavers.xml" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.MySQL/FodyWeavers.xml"
similarity index 100%
rename from "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.MySQL/FodyWeavers.xml"
rename to "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.MySQL/FodyWeavers.xml"
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.MySQL/Properties/AssemblyInfo.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.MySQL/Properties/AssemblyInfo.cs"
similarity index 100%
rename from "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.MySQL/Properties/AssemblyInfo.cs"
rename to "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.MySQL/Properties/AssemblyInfo.cs"
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.MySQL/Scripts/UpdateDB.bat" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.MySQL/Scripts/UpdateDB.bat"
similarity index 100%
rename from "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.MySQL/Scripts/UpdateDB.bat"
rename to "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.MySQL/Scripts/UpdateDB.bat"
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.PostgreSql/Scripts/UpdateMigrations.bat" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.MySQL/Scripts/UpdateMigrations.bat"
similarity index 100%
copy from "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.PostgreSql/Scripts/UpdateMigrations.bat"
copy to "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.MySQL/Scripts/UpdateMigrations.bat"
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.PostgreSql/CMS.Plugin.WareCmsUtilityApi.PostgreSql.csproj" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.PostgreSql/CMS.Plugin.WareCmsUtilityApi.PostgreSql.csproj"
new file mode 100644
index 0000000..b4a1be1
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.PostgreSql/CMS.Plugin.WareCmsUtilityApi.PostgreSql.csproj"
@@ -0,0 +1,30 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+ <Import Project="../../common.props" />
+ <Import Project="../../configureawait.props" />
+
+ <PropertyGroup>
+ <TargetFramework>net6.0</TargetFramework>
+
+ </PropertyGroup>
+
+ <ItemGroup>
+ <PackageReference Include="Volo.Abp.EntityFrameworkCore.PostgreSql" Version="$(ABPPackageVersion)" />
+ </ItemGroup>
+
+ <ItemGroup>
+ <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.5">
+ <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+ <PrivateAssets>compile; contentFiles; build; buildMultitargeting; buildTransitive; analyzers; native</PrivateAssets>
+ </PackageReference>
+ </ItemGroup>
+
+ <ItemGroup>
+ <ProjectReference Include="..\CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore\CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore.csproj" />
+ </ItemGroup>
+
+ <ItemGroup>
+ <Folder Include="Migrations\" />
+ </ItemGroup>
+
+</Project>
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.PostgreSql/CMSPluginDbContext.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.PostgreSql/CMSPluginDbContext.cs"
new file mode 100644
index 0000000..381f2ac
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.PostgreSql/CMSPluginDbContext.cs"
@@ -0,0 +1,48 @@
+using CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore.Extensions;
+using CMS.Plugin.WareCmsUtilityApi.Domain;
+using CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
+using Volo.Abp.Data;
+using Volo.Abp.EntityFrameworkCore;
+using Volo.Abp.EntityFrameworkCore.Modeling;
+
+namespace CMS.Plugin.WareCmsUtilityApi.PostgreSql;
+
+/// <summary>
+/// 鏁版嵁搴撲笂涓嬫枃
+/// </summary>
+[ConnectionStringName(CMSPluginDbProperties.ConnectionStringName)]
+public class CMSPluginDbContext : AbpDbContext<CMSPluginDbContext>, ICMSPluginDbContext
+{
+ /* Add DbSet properties for your Aggregate Roots / Entities here. */
+
+ /// <summary>
+ /// Initializes a new instance of the <see cref="CMSPluginDbContext"/> class.
+ /// </summary>
+ /// <param name="options">The options.</param>
+ public CMSPluginDbContext(DbContextOptions<CMSPluginDbContext> options)
+ : base(options)
+ {
+ }
+
+ /// <inheritdoc />
+ protected override void OnModelCreating(ModelBuilder builder)
+ {
+ base.OnModelCreating(builder);
+
+ /* Include modules to your migration db context */
+
+ builder.ConfigureSample();
+
+ /* Configure your own tables/entities inside here */
+
+ //builder.Entity<YourEntity>(b =>
+ //{
+ // b.ToTable(CMSPluginDbProperties.DbTablePrefix + "YourEntities", CMSPluginDbProperties.DbSchema);
+ // b.ConfigureByConvention(); //auto configure for the base class props
+ // //...
+ //});
+
+ builder.TryConfigureObjectExtensions<CMSPluginDbContext>();
+ }
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.PostgreSql/CMSPluginDbContextFactory.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.PostgreSql/CMSPluginDbContextFactory.cs"
new file mode 100644
index 0000000..effc772
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.PostgreSql/CMSPluginDbContextFactory.cs"
@@ -0,0 +1,43 @@
+using CMS.Plugin.WareCmsUtilityApi.Domain;
+using CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Design;
+using Microsoft.Extensions.Configuration;
+
+namespace CMS.Plugin.WareCmsUtilityApi.PostgreSql;
+
+/// <summary>
+/// This class is needed for EF Core console commands
+/// (like Add-Migration and Update-Database commands)
+/// </summary>
+public class CMSPluginDbContextFactory : IDesignTimeDbContextFactory<CMSPluginDbContext>
+{
+ /// <summary>
+ /// Creates a new instance of a derived context.
+ /// </summary>
+ /// <param name="args">Arguments provided by the design-time service.</param>
+ public CMSPluginDbContext CreateDbContext(string[] args)
+ {
+ CMSPluginEfCoreEntityExtensionMappings.Configure();
+
+ var configuration = BuildConfiguration();
+
+ var builder = new DbContextOptionsBuilder<CMSPluginDbContext>()
+ .UseNpgsql(configuration.GetConnectionString("Default"), x => x.MigrationsHistoryTable(CMSPluginDbProperties.MigrationsHistoryTable, CMSPluginDbProperties.DbSchema));
+
+ return new CMSPluginDbContext(builder.Options);
+ }
+
+ /// <summary>
+ /// Builds the configuration.
+ /// </summary>
+ /// <returns></returns>
+ private static IConfigurationRoot BuildConfiguration()
+ {
+ var builder = new ConfigurationBuilder()
+ .SetBasePath(Path.Combine(Directory.GetCurrentDirectory(), "../CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore/"))
+ .AddJsonFile("appsettings.json", optional: false);
+
+ return builder.Build();
+ }
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.PostgreSql/CMSPluginPostgreSqlModule.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.PostgreSql/CMSPluginPostgreSqlModule.cs"
new file mode 100644
index 0000000..1542019
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.PostgreSql/CMSPluginPostgreSqlModule.cs"
@@ -0,0 +1,42 @@
+using CMS.Plugin.WareCmsUtilityApi.Domain;
+using CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore;
+using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp.EntityFrameworkCore;
+using Volo.Abp.Modularity;
+
+namespace CMS.Plugin.WareCmsUtilityApi.PostgreSql;
+
+/// <summary>
+/// EntityFrameworkCore妯″潡
+/// </summary>
+[DependsOn(typeof(CMSPluginEntityFrameworkCoreModule))]
+public class CMSPluginPostgreSqlModule : AbpModule
+{
+ /// <inheritdoc />
+ public override void PreConfigureServices(ServiceConfigurationContext context)
+ {
+ CMSPluginEfCoreEntityExtensionMappings.Configure();
+ }
+
+ /// <inheritdoc />
+ public override void ConfigureServices(ServiceConfigurationContext context)
+ {
+ context.Services.AddAbpDbContext<CMSPluginDbContext>(options =>
+ {
+ /* Remove "includeAllEntities: true" to create
+ * default repositories only for aggregate roots */
+ //options.AddDefaultRepositories(includeAllEntities: true);
+ });
+
+ Configure<AbpDbContextOptions>(options =>
+ {
+ /* The main point to change your DBMS.
+ * See also CMSMigrationsDbContextFactory for EF Core tooling. */
+ options.UseNpgsql(x =>
+ {
+ x.MigrationsHistoryTable(CMSPluginDbProperties.MigrationsHistoryTable, CMSPluginDbProperties.DbSchema);
+ //x.EnableRetryOnFailure();
+ });
+ });
+ }
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.PostgreSql/FodyWeavers.xml" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.PostgreSql/FodyWeavers.xml"
similarity index 100%
rename from "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.PostgreSql/FodyWeavers.xml"
rename to "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.PostgreSql/FodyWeavers.xml"
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.PostgreSql/Properties/AssemblyInfo.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.PostgreSql/Properties/AssemblyInfo.cs"
similarity index 100%
rename from "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.PostgreSql/Properties/AssemblyInfo.cs"
rename to "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.PostgreSql/Properties/AssemblyInfo.cs"
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.PostgreSql/Scripts/UpdateDB.bat" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.PostgreSql/Scripts/UpdateDB.bat"
similarity index 100%
rename from "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.PostgreSql/Scripts/UpdateDB.bat"
rename to "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.PostgreSql/Scripts/UpdateDB.bat"
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.PostgreSql/Scripts/UpdateMigrations.bat" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.PostgreSql/Scripts/UpdateMigrations.bat"
similarity index 100%
rename from "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.PostgreSql/Scripts/UpdateMigrations.bat"
rename to "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.PostgreSql/Scripts/UpdateMigrations.bat"
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.SqlServer/CMS.Plugin.WareCmsUtilityApi.SqlServer.csproj" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.SqlServer/CMS.Plugin.WareCmsUtilityApi.SqlServer.csproj"
new file mode 100644
index 0000000..197dc51
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.SqlServer/CMS.Plugin.WareCmsUtilityApi.SqlServer.csproj"
@@ -0,0 +1,30 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+ <Import Project="../../common.props" />
+ <Import Project="../../configureawait.props" />
+
+ <PropertyGroup>
+ <TargetFramework>net6.0</TargetFramework>
+
+ </PropertyGroup>
+
+ <ItemGroup>
+ <PackageReference Include="Volo.Abp.EntityFrameworkCore.SqlServer" Version="$(ABPPackageVersion)" />
+ </ItemGroup>
+
+ <ItemGroup>
+ <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.5">
+ <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+ <PrivateAssets>compile; contentFiles; build; buildMultitargeting; buildTransitive; analyzers; native</PrivateAssets>
+ </PackageReference>
+ </ItemGroup>
+
+ <ItemGroup>
+ <ProjectReference Include="..\CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore\CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore.csproj" />
+ </ItemGroup>
+
+ <ItemGroup>
+ <Folder Include="Migrations\" />
+ </ItemGroup>
+
+</Project>
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.SqlServer/CMSPluginDbContext.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.SqlServer/CMSPluginDbContext.cs"
new file mode 100644
index 0000000..07926f7
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.SqlServer/CMSPluginDbContext.cs"
@@ -0,0 +1,48 @@
+using CMS.Plugin.WareCmsUtilityApi.Domain;
+using CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore.Extensions;
+using CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
+using Volo.Abp.Data;
+using Volo.Abp.EntityFrameworkCore;
+using Volo.Abp.EntityFrameworkCore.Modeling;
+
+namespace CMS.Plugin.WareCmsUtilityApi.SqlServer;
+
+/// <summary>
+/// 鏁版嵁搴撲笂涓嬫枃
+/// </summary>
+[ConnectionStringName(CMSPluginDbProperties.ConnectionStringName)]
+public class CMSPluginDbContext : AbpDbContext<CMSPluginDbContext>, ICMSPluginDbContext
+{
+ /* Add DbSet properties for your Aggregate Roots / Entities here. */
+
+ /// <summary>
+ /// Initializes a new instance of the <see cref="CMSPluginDbContext"/> class.
+ /// </summary>
+ /// <param name="options">The options.</param>
+ public CMSPluginDbContext(DbContextOptions<CMSPluginDbContext> options)
+ : base(options)
+ {
+ }
+
+ /// <inheritdoc />
+ protected override void OnModelCreating(ModelBuilder builder)
+ {
+ base.OnModelCreating(builder);
+
+ /* Include modules to your migration db context */
+
+ builder.ConfigureSample();
+
+ /* Configure your own tables/entities inside here */
+
+ //builder.Entity<YourEntity>(b =>
+ //{
+ // b.ToTable(CMSPluginDbProperties.DbTablePrefix + "YourEntities", CMSPluginDbProperties.DbSchema);
+ // b.ConfigureByConvention(); //auto configure for the base class props
+ // //...
+ //});
+
+ builder.TryConfigureObjectExtensions<CMSPluginDbContext>();
+ }
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.SqlServer/CMSPluginDbContextFactory.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.SqlServer/CMSPluginDbContextFactory.cs"
new file mode 100644
index 0000000..d9a57e5
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.SqlServer/CMSPluginDbContextFactory.cs"
@@ -0,0 +1,43 @@
+using CMS.Plugin.WareCmsUtilityApi.Domain;
+using CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Design;
+using Microsoft.Extensions.Configuration;
+
+namespace CMS.Plugin.WareCmsUtilityApi.SqlServer;
+
+/// <summary>
+/// This class is needed for EF Core console commands
+/// (like Add-Migration and Update-Database commands)
+/// </summary>
+public class CMSPluginDbContextFactory : IDesignTimeDbContextFactory<CMSPluginDbContext>
+{
+ /// <summary>
+ /// Creates a new instance of a derived context.
+ /// </summary>
+ /// <param name="args">Arguments provided by the design-time service.</param>
+ public CMSPluginDbContext CreateDbContext(string[] args)
+ {
+ CMSPluginEfCoreEntityExtensionMappings.Configure();
+
+ var configuration = BuildConfiguration();
+
+ var builder = new DbContextOptionsBuilder<CMSPluginDbContext>()
+ .UseSqlServer(configuration.GetConnectionString("Default"), x => x.MigrationsHistoryTable(CMSPluginDbProperties.MigrationsHistoryTable, CMSPluginDbProperties.DbSchema));
+
+ return new CMSPluginDbContext(builder.Options);
+ }
+
+ /// <summary>
+ /// Builds the configuration.
+ /// </summary>
+ /// <returns></returns>
+ private static IConfigurationRoot BuildConfiguration()
+ {
+ var builder = new ConfigurationBuilder()
+ .SetBasePath(Path.Combine(Directory.GetCurrentDirectory(), "../CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore/"))
+ .AddJsonFile("appsettings.json", optional: false);
+
+ return builder.Build();
+ }
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.SqlServer/CMSPluginSqlServerModule.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.SqlServer/CMSPluginSqlServerModule.cs"
new file mode 100644
index 0000000..0f07821
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.SqlServer/CMSPluginSqlServerModule.cs"
@@ -0,0 +1,42 @@
+using CMS.Plugin.WareCmsUtilityApi.Domain;
+using CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore;
+using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp.EntityFrameworkCore;
+using Volo.Abp.Modularity;
+
+namespace CMS.Plugin.WareCmsUtilityApi.SqlServer;
+
+/// <summary>
+/// EntityFrameworkCore妯″潡
+/// </summary>
+[DependsOn(typeof(CMSPluginEntityFrameworkCoreModule))]
+public class CMSPluginSqlServerModule : AbpModule
+{
+ /// <inheritdoc />
+ public override void PreConfigureServices(ServiceConfigurationContext context)
+ {
+ CMSPluginEfCoreEntityExtensionMappings.Configure();
+ }
+
+ /// <inheritdoc />
+ public override void ConfigureServices(ServiceConfigurationContext context)
+ {
+ context.Services.AddAbpDbContext<CMSPluginDbContext>(options =>
+ {
+ /* Remove "includeAllEntities: true" to create
+ * default repositories only for aggregate roots */
+ //options.AddDefaultRepositories(includeAllEntities: true);
+ });
+
+ Configure<AbpDbContextOptions>(options =>
+ {
+ /* The main point to change your DBMS.
+ * See also CMSMigrationsDbContextFactory for EF Core tooling. */
+ options.UseSqlServer(x =>
+ {
+ x.MigrationsHistoryTable(CMSPluginDbProperties.MigrationsHistoryTable, CMSPluginDbProperties.DbSchema);
+ //x.EnableRetryOnFailure();
+ });
+ });
+ }
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.SqlServer/FodyWeavers.xml" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.SqlServer/FodyWeavers.xml"
similarity index 100%
rename from "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.SqlServer/FodyWeavers.xml"
rename to "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.SqlServer/FodyWeavers.xml"
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.SqlServer/Properties/AssemblyInfo.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.SqlServer/Properties/AssemblyInfo.cs"
similarity index 100%
rename from "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.SqlServer/Properties/AssemblyInfo.cs"
rename to "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.SqlServer/Properties/AssemblyInfo.cs"
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.SqlServer/Scripts/UpdateDB.bat" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.SqlServer/Scripts/UpdateDB.bat"
similarity index 100%
rename from "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.SqlServer/Scripts/UpdateDB.bat"
rename to "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.SqlServer/Scripts/UpdateDB.bat"
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.SqlServer/Scripts/UpdateMigrations.bat" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.SqlServer/Scripts/UpdateMigrations.bat"
similarity index 100%
rename from "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.SqlServer/Scripts/UpdateMigrations.bat"
rename to "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi.SqlServer/Scripts/UpdateMigrations.bat"
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi/Apis/IWareCmsUtilityApiExternalApi.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi/Apis/IWareCmsUtilityApiExternalApi.cs"
new file mode 100644
index 0000000..d9e386a
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi/Apis/IWareCmsUtilityApiExternalApi.cs"
@@ -0,0 +1,18 @@
+using CMS.Plugin.WareCmsUtilityApi.Application.Contracts.Dtos.Samples;
+using WebApiClientCore.Attributes;
+
+namespace CMS.Plugin.WareCmsUtilityApi.Apis
+{
+ /// <summary>
+ /// 澶栭儴Http API瀵规帴 // https://webapiclient.github.io/guide/getting-started.html
+ /// </summary>
+ public interface IWareCmsUtilityApiExternalApi
+ {
+ /// <summary>
+ /// CreateAsync
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("api/v1/warecmsutilityapi/sample")]
+ Task<SampleDto> CreateAsync([JsonContent] SampleCreateDto input);
+ }
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi/CMS.Plugin.WareCmsUtilityApi.csproj" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi/CMS.Plugin.WareCmsUtilityApi.csproj"
new file mode 100644
index 0000000..de17256
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi/CMS.Plugin.WareCmsUtilityApi.csproj"
@@ -0,0 +1,67 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+ <Import Project="../../common.props" />
+ <Import Project="../../configureawait.props" />
+
+ <PropertyGroup>
+ <TargetFramework>net6.0</TargetFramework>
+ <EnableDynamicLoading>true</EnableDynamicLoading>
+ <ProduceReferenceAssembly>false</ProduceReferenceAssembly>
+ <GenerateDocumentationFile>true</GenerateDocumentationFile>
+ </PropertyGroup>
+
+ <PropertyGroup Condition="$([MSBuild]::IsOSPlatform('Windows'))">
+ <CMSRootPath>C:\Program Files\CMS Editor</CMSRootPath>
+ <OutputPath>$(CMSRootPath)\plugins\cms.plugin.messuite</OutputPath>
+ </PropertyGroup>
+
+ <PropertyGroup Condition="$([MSBuild]::IsOSPlatform('OSX'))">
+ <CMSRootPath>/Volumes/SSD/CMS Editor</CMSRootPath>
+ <OutputPath>$(CMSRootPath)\plugins\cms.plugin.messuite</OutputPath>
+ </PropertyGroup>
+
+ <ItemGroup>
+ <None Remove="appsettings.json" />
+ <None Remove="Flows\50001_1.pfd" />
+ <None Remove="Flows\FlowInfo.xml" />
+ <None Remove="Resources\Templates\Sample瀵煎嚭妯℃澘.xlsx" />
+ </ItemGroup>
+
+ <ItemGroup>
+ <Content Include="appsettings.json">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ </ItemGroup>
+
+ <ItemGroup>
+ <EmbeddedResource Include="Resources\Templates\Sample瀵煎嚭妯℃澘.xlsx">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </EmbeddedResource>
+ </ItemGroup>
+
+ <ItemGroup>
+ <PackageReference Include="CMS.Framework.AspNetCore" Version="2.16.1" />
+ <PackageReference Include="CMS.Extensions.Variable" Version="2.16.1" />
+ <PackageReference Include="CMS.Extensions.Data" Version="2.16.1" />
+ <PackageReference Include="CMS.Data.Stressing" Version="2.16.1" />
+ <PackageReference Include="CMS.Extensions.Abp" Version="1.4.0" />
+ <PackageReference Include="WebApiClientCore" Version="2.0.4" />
+ </ItemGroup>
+
+ <ItemGroup>
+ <ProjectReference Include="..\CMS.Plugin.WareCmsUtilityApi.Application\CMS.Plugin.WareCmsUtilityApi.Application.csproj" />
+ <ProjectReference Include="..\CMS.Plugin.WareCmsUtilityApi.MySQL\CMS.Plugin.WareCmsUtilityApi.MySQL.csproj" />
+ <ProjectReference Include="..\CMS.Plugin.WareCmsUtilityApi.PostgreSql\CMS.Plugin.WareCmsUtilityApi.PostgreSql.csproj" />
+ <ProjectReference Include="..\CMS.Plugin.WareCmsUtilityApi.SqlServer\CMS.Plugin.WareCmsUtilityApi.SqlServer.csproj" />
+ </ItemGroup>
+
+ <ItemGroup>
+ <Resource Include="Flows\50001_1.pfd">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Resource>
+ <Resource Include="Flows\FlowInfo.xml">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Resource>
+ </ItemGroup>
+
+</Project>
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi/CMSPluginEntry.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi/CMSPluginEntry.cs"
new file mode 100644
index 0000000..d40c1af
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi/CMSPluginEntry.cs"
@@ -0,0 +1,109 @@
+using System.Collections;
+using Autofac;
+using CMS.Data.Stressing;
+using CMS.DataPersistence;
+using CMS.DataPersistence.Data;
+using CMS.Extensions.Abp.Autofac.Extensions.DependencyInjection;
+using CMS.Plugin.MesSuite.Abstractions;
+using CMS.Plugin.MesSuite.Abstractions.Consts;
+using CMS.Plugin.WareCmsUtilityApi.Abstractions;
+using CMS.Plugin.WareCmsUtilityApi.Apis;
+using CMS.Plugin.WareCmsUtilityApi.Domain;
+using CMS.Plugin.WareCmsUtilityApi.ProjectService;
+using CMS.Plugin.WareCmsUtilityApi.Workers;
+using CMS.Plugin.WareCmsUtilityApi.Apis;
+using CMS.Project.Abstractions;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.DependencyInjection;
+using Structing.AspNetCore;
+using Structing.Core;
+using Structing.Web;
+using SYC.Plugin;
+using Volo.Abp.BackgroundWorkers;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Modularity.PlugIns;
+
+namespace CMS.Plugin.WareCmsUtilityApi;
+
+/// <summary>
+/// CMS鎻掍欢鍏ュ彛锛屼娇鐢�<see cref="EnableApplicationPartAttribute"/>灏嗗鍏ontroller.
+/// </summary>
+[EnableApplicationPart]
+public class CMSPluginEntry : PluginEntry
+{
+ private readonly IServiceCollection _service = new ServiceCollection();
+
+ /// <inheritdoc />
+ public override void Register(IRegisteContext context)
+ {
+ var configuration = context.Features.GetConfiguration();
+
+ // 閰嶇疆澶栭儴HttpApi锛� https://webapiclient.github.io/
+ context.Services
+ .AddHttpApi<IWareCmsUtilityApiExternalApi>()
+ .ConfigureHttpApi(configuration.GetSection(nameof(IWareCmsUtilityApiExternalApi)));
+
+ context.Services.TryAddWareCmsUtilityApi();
+
+ context.Services.AddScoped<IProjectRuntimeMigrator, CMSPluginRuntimeMigrator>();
+ context.Services.AddSingleton<IProjectService, WareCmsUtilityApiProjectService>();
+
+ context.Services.AddScoped<IEFDataProvider>(p =>
+ {
+ var cfg = p.GetRequiredService<IDataRuntimeConfig>();
+ return new DefaultEFDataProvider(CMSPluginMesSuiteOptions.DataProviderName, CMSPluginMesSuiteOptions.GetDatabaseSuffix(CMSPluginDbProperties.MigrationsHistoryTable), CMSPluginDbProperties.MigrationsHistoryTable, cfg);
+ });
+
+ _service.AddObjectAccessor<IApplicationBuilder>();
+ _service.AddApplication<CMSPluginModule>(options =>
+ {
+ var databaseType = configuration[SectionName.DatabaseType] ?? "mysql";
+ if (KnowsDbCode.IsMysql(databaseType))
+ {
+ options.PlugInSources.Add(new TypePlugInSource(
+ typeof(MySQL.CMSPluginMySQLModule)
+ ));
+ }
+ else if (KnowsDbCode.IsSqlServer(databaseType))
+ {
+ options.PlugInSources.Add(new TypePlugInSource(
+ typeof(SqlServer.CMSPluginSqlServerModule)
+ ));
+ }
+ else if (KnowsDbCode.IsPostgreSql(databaseType))
+ {
+ options.PlugInSources.Add(new TypePlugInSource(
+ typeof(PostgreSql.CMSPluginPostgreSqlModule)
+ ));
+ }
+ });
+
+ base.Register(context);
+ }
+
+ /// <inheritdoc />
+ public override void ConfigureContainer(ContainerBuilder builder)
+ {
+ builder.Populate(_service);
+
+ base.ConfigureContainer(builder);
+ }
+
+ /// <inheritdoc />
+ public override async Task ReadyAsync(IReadyContext context)
+ {
+ context.Provider.GetRequiredService<ObjectAccessor<IApplicationBuilder>>().Value = context.Features.GetApplicationBuilder();
+ var app = context.Features.GetApplicationBuilder();
+ await app.InitializeApplicationAsync();
+
+ await base.ReadyAsync(context);
+ }
+
+ /// <inheritdoc />
+ public override async Task AfterReadyAsync(IReadyContext context)
+ {
+ await context.GetRequiredService<IBackgroundWorkerManager>().AddAsync(context.GetRequiredService<WareCmsUtilityApiWorker>());
+
+ await base.AfterReadyAsync(context);
+ }
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi/CMSPluginModule.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi/CMSPluginModule.cs"
new file mode 100644
index 0000000..a29fee9
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi/CMSPluginModule.cs"
@@ -0,0 +1,42 @@
+using System.Reflection;
+using CMS.Extensions.Abp;
+using CMS.Extensions.Abp.AspNetCore;
+using CMS.Plugin.WareCmsUtilityApi.Abstractions;
+using CMS.Plugin.WareCmsUtilityApi.Application;
+using CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore;
+using CMS.Plugin.WareCmsUtilityApi.Jobs;
+using Volo.Abp.BackgroundJobs;
+using Volo.Abp.Modularity;
+
+namespace CMS.Plugin.WareCmsUtilityApi
+{
+ /// <summary>
+ /// CMS 鎻掍欢渚濊禆鍔犺浇鍚姩妯″潡
+ /// </summary>
+ [DependsOn(
+ typeof(CMSPluginAbpModule),
+ typeof(CMSPluginAbpAspNetCoreModule),
+ typeof(CMSPluginApplicationModule),
+ typeof(CMSPluginEntityFrameworkCoreModule)
+ )]
+ public class CMSPluginModule : AbpStartupModule
+ {
+ /// <inheritdoc />
+ public override void ConfigureServices(ServiceConfigurationContext context)
+ {
+ Configure<AbpBackgroundJobOptions>(options =>
+ {
+ options.AddJob<WareCmsUtilityApiJob>();
+ });
+ }
+
+ /// <inheritdoc />
+ public override Assembly[]? GetSharedAssemblies()
+ {
+ return base.GetSharedAssemblies().Concat(new[]
+ {
+ typeof(CMSPluginWareCmsUtilityApiAbstractionsModule).Assembly,
+ }).ToArray();
+ }
+ }
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi/CMSPluginRuntimeMigrator.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi/CMSPluginRuntimeMigrator.cs"
new file mode 100644
index 0000000..75fd69a
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi/CMSPluginRuntimeMigrator.cs"
@@ -0,0 +1,46 @@
+using CMS.Plugin.WareCmsUtilityApi.Domain.Data;
+using CMS.Project.Abstractions;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Volo.Abp.DependencyInjection;
+
+namespace CMS.Plugin.WareCmsUtilityApi
+{
+ /// <summary>
+ /// 宸ョ▼鏁版嵁搴撹縼绉诲櫒锛屽綋<see cref="IProjectRunner"/>鍔犺浇宸ョ▼鏃舵瀵硅薄浼氳鍒涘缓璋冪敤
+ /// </summary>
+ public class CMSPluginRuntimeMigrator : IProjectRuntimeMigrator
+ {
+ /// <summary>
+ /// 鎵ц杩佺Щ
+ /// </summary>
+ /// <param name="project">褰撳墠瑕佽繍琛岀殑宸ョ▼</param>
+ /// <param name="serviceProvider">瀛樺湪杩愯宸ョ▼涓婁笅鏂囩殑serviceProvider</param>
+ /// <returns></returns>
+ public async Task UpgradeAsync(Project.Project project, IServiceProvider serviceProvider)
+ {
+ var objectAccessor = serviceProvider.GetService<ObjectAccessor<Project.Project>>();
+ if (objectAccessor != null)
+ {
+ objectAccessor.Value = project;
+ }
+
+ var logger = serviceProvider.GetRequiredService<ILogger<CMSPluginRuntimeMigrator>>();
+ try
+ {
+ // 閫氳繃serviceProvider鑾峰彇鑷繁鐨凞bContext骞惰繘琛屽垱寤烘垨杩佺Щ娴佺▼
+ logger.LogInformation($"Start {project.Info.Id} WareCmsUtilityApi dbcontext create");
+ await serviceProvider.GetRequiredService<CMSPluginDbMigrationService>().MigrateAsync();
+ }
+ catch (Exception ex)
+ {
+ logger.LogError(ex, "Create WareCmsUtilityApi db failed");
+ }
+
+ if (objectAccessor != null)
+ {
+ objectAccessor.Value = null;
+ }
+ }
+ }
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi/Controller/SampleController.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi/Controller/SampleController.cs"
new file mode 100644
index 0000000..aa3918d
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi/Controller/SampleController.cs"
@@ -0,0 +1,187 @@
+using Ao.Lang;
+using CMS.Extensions.Abp.AspNetCore.Mvc.Filters;
+using CMS.Plugin.WareCmsUtilityApi.Application.Contracts.Dtos.Samples;
+using CMS.Plugin.WareCmsUtilityApi.Application.Contracts.Services;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using MiniExcelLibs;
+using System.Reflection;
+using Volo.Abp;
+using Volo.Abp.Application.Dtos;
+
+namespace CMS.Plugin.WareCmsUtilityApi.Controller
+{
+ /// <summary>
+ /// Sample鏈嶅姟
+ /// </summary>
+ [ApiController]
+ [TypeFilter(typeof(CMSLanguageFilter))]
+ [TypeFilter(typeof(CMSUowActionFilter))]
+ [TypeFilter(typeof(CMSAuditActionFilter))]
+ [TypeFilter(typeof(CMSExceptionFilter))]
+ [Route("api/v{version:apiVersion}/WareCmsUtilityApi/[controller]")]
+ public class SampleController : ControllerBase
+ {
+ private readonly ISampleAppService _sampleAppService;
+
+ /// <summary>
+ /// Initializes a new instance of the <see cref="SampleController"/> class.
+ /// </summary>
+ /// <param name="sampleAppService">The sample application service.</param>
+ public SampleController(ISampleAppService sampleAppService)
+ {
+ _sampleAppService = sampleAppService;
+ }
+
+ /// <summary>
+ /// 鑾峰彇sample.
+ /// </summary>
+ /// <param name="id">鏍囪瘑绗�.</param>
+ /// <returns></returns>
+ [HttpGet]
+ [Route("{id}")]
+ public virtual Task<SampleDto> GetAsync(Guid id)
+ {
+ return _sampleAppService.GetAsync(id);
+ }
+
+ /// <summary>
+ /// 鑾峰彇sample鐨勫垪琛�.
+ /// </summary>
+ /// <param name="input">杈撳叆.</param>
+ /// <returns></returns>
+ [HttpGet]
+ public virtual Task<PagedResultDto<SampleDto>> GetListAsync([FromQuery] GetSamplesInput input)
+ {
+ return _sampleAppService.GetListAsync(input);
+ }
+
+ /// <summary>
+ /// 鍒涘缓sample.
+ /// </summary>
+ /// <param name="input">杈撳叆.</param>
+ /// <returns></returns>
+ //[Authorize]
+ [HttpPost]
+ public virtual Task<SampleDto> CreateAsync(SampleCreateDto input)
+ {
+ return _sampleAppService.CreateAsync(input);
+ }
+
+ /// <summary>
+ /// 鏇存柊sample.
+ /// </summary>
+ /// <param name="id">鏍囪瘑绗�.</param>
+ /// <param name="input">杈撳叆.</param>
+ /// <returns></returns>
+ //[Authorize]
+ [HttpPut]
+ [Route("{id}")]
+ public virtual Task<SampleDto> UpdateAsync(Guid id, SampleUpdateDto input)
+ {
+ return _sampleAppService.UpdateAsync(id, input);
+ }
+
+ /// <summary>
+ /// 鍏嬮殕Sample.
+ /// </summary>
+ /// <param name="ids">Id闆嗗悎.</param>
+ /// <returns></returns>
+ //[Authorize]
+ [HttpPost]
+ [Route("Clone")]
+ public virtual Task<List<SampleDto>> CloneAsync([FromBody] IEnumerable<Guid> ids)
+ {
+ return _sampleAppService.CloneAsync(ids);
+ }
+
+ /// <summary>
+ /// 鍒犻櫎sample.
+ /// </summary>
+ /// <param name="id">鏍囪瘑绗�.</param>
+ /// <returns></returns>
+ //[Authorize]
+ [HttpDelete]
+ [Route("{id}")]
+ public virtual Task DeleteAsync(Guid id)
+ {
+ return _sampleAppService.DeleteAsync(id);
+ }
+
+ /// <summary>
+ /// 鎵归噺鍒犻櫎sample.
+ /// </summary>
+ /// <param name="ids">The ids.</param>
+ /// <returns></returns>
+ //[Authorize]
+ [HttpDelete]
+ public virtual Task DeleteAsync([FromBody] IEnumerable<Guid> ids)
+ {
+ return _sampleAppService.DeleteManyAsync(ids);
+ }
+
+ /// <summary>
+ /// 璋冩暣鎺掑簭.
+ /// </summary>
+ /// <param name="id">鏍囪瘑绗�.</param>
+ /// <returns></returns>
+ [HttpPut]
+ [Route("{id}/AdjustSort/{sort}")]
+ public virtual Task AdjustSortAsync(Guid id, int sort)
+ {
+ return _sampleAppService.AdjustSortAsync(id, sort);
+ }
+
+ /// <summary>
+ /// 瀵煎叆sample.
+ /// </summary>
+ /// <returns></returns>
+ [Authorize]
+ [HttpPost]
+ [Route("Import")]
+ public virtual async Task<IActionResult> ImportAsync(IFormFile file)
+ {
+ using var stream = new MemoryStream();
+ await file.CopyToAsync(stream);
+ stream.Seek(0L, SeekOrigin.Begin);
+
+ var sheetNames = stream.GetSheetNames();
+ var sampleRows = sheetNames.Contains("閰嶇疆") ? MiniExcel.Query<SamplesImportModel.SampleImportModel>(stream, sheetName: "閰嶇疆").ToList() : new();
+
+ if (!sampleRows.Any())
+ {
+ throw new UserFriendlyException("璇锋鏌ュ鍏ョ殑琛ㄦ牸");
+ }
+
+ await _sampleAppService.ImportAsync(new SamplesImportModel
+ {
+ Samples = sampleRows,
+ });
+
+ return Ok();
+ }
+
+ /// <summary>
+ /// 瀵煎嚭sample.
+ /// </summary>
+ /// <returns></returns>
+ [HttpGet]
+ [Route("Export")]
+ public virtual async Task<IActionResult> ExportAsync([FromQuery] GetSamplesInput input)
+ {
+ input.MaxResultCount = int.MaxValue;
+ var exportData = await _sampleAppService.ExportAsync(input);
+ var templatePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, $"Resources/Templates/Sample瀵煎嚭妯℃澘.xlsx");
+ if (!System.IO.File.Exists(templatePath))
+ {
+ templatePath = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) ?? string.Empty, $"Resources/Templates/Sample瀵煎嚭妯℃澘.xlsx");
+ }
+
+ var memoryStream = new MemoryStream();
+ await memoryStream.SaveAsByTemplateAsync(templatePath, exportData.Sheets);
+ memoryStream.Seek(0L, SeekOrigin.Begin);
+ return new FileStreamResult(memoryStream, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet") { FileDownloadName = $"{exportData.FileName}_{DateTime.Now:yyyyMMddhhmmss}.xlsx" };
+ }
+ }
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi/EventHandlers/WareCmsUtilityApiEventHandler.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi/EventHandlers/WareCmsUtilityApiEventHandler.cs"
new file mode 100644
index 0000000..72ce5e3
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi/EventHandlers/WareCmsUtilityApiEventHandler.cs"
@@ -0,0 +1,80 @@
+using CMS.Plugin.MesSuite.Abstractions.Events;
+using CMS.Plugin.MesSuite.Abstractions.Models;
+using CMS.Plugin.WareCmsUtilityApi.Domain.Samples;
+using CMS.Plugin.OrderManagement.Abstractions.Models;
+using CMS.Plugin.ProcessManagement.Abstractions.Models;
+using CMS.Plugin.TraceManagement.Abstractions.Models.Traces;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.EventBus.Distributed;
+using Volo.Abp.Uow;
+
+namespace CMS.Plugin.WareCmsUtilityApi.EventHandlers
+{
+ /// <summary>
+ /// 娴佺▼浜嬩欢澶勭悊绋嬪簭
+ /// </summary>
+ public class WareCmsUtilityApiEventHandler : IDistributedEventHandler<ProcessFlowEto>, ITransientDependency
+ {
+ private readonly ILogger _logger;
+ private readonly IServiceProvider _serviceProvider;
+
+ /// <summary>
+ /// Initializes a new instance of the <see cref="WareCmsUtilityApiEventHandler"/> class.
+ /// </summary>
+ /// <param name="logger">The logger.</param>
+ /// <param name="serviceProvider">The service provider.</param>
+ public WareCmsUtilityApiEventHandler(ILogger<WareCmsUtilityApiEventHandler> logger, IServiceProvider serviceProvider)
+ {
+ this._logger = logger;
+ this._serviceProvider = serviceProvider;
+ }
+
+ /// <summary>
+ /// Handler handles the event by implementing this method.
+ /// </summary>
+ /// <param name="eventData">Event data</param>
+ public async Task HandleEventAsync(ProcessFlowEto eventData)
+ {
+ if (eventData.Activity.Equals("姝ラ鍚嶇О"))
+ {
+ _logger.LogInformation($"SampleEventHandler: Activity={eventData.Activity}");
+
+ var serialNumber = eventData?.FlowItems[FlowItemCollection.SerialNumber]?.ToString();
+
+ // 宸ヨ壓妯″瀷
+ var process = eventData?.FlowItems[FlowItemCollection.ApplicationData] as ProcessModel;
+
+ // 浜у搧妯″瀷
+ var product = eventData?.FlowItems[FlowItemCollection.ProductModel] as AssociationProductModel;
+
+ // 杩芥函妯″瀷
+ var trace = eventData?.FlowItems[FlowItemCollection.TraceModel] as TraceModel;
+
+ // 宸ュ崟妯″瀷
+ var order = eventData?.FlowItems[FlowItemCollection.OrderModel] as OrderModel;
+
+ // 涓氬姟澶勭悊
+ await ProcessAsync();
+ }
+ }
+
+ /// <summary>
+ /// Processes the asynchronous.
+ /// </summary>
+ private async Task ProcessAsync()
+ {
+ using var scope = _serviceProvider.CreateScope();
+ var unitOfWorkManager = scope.ServiceProvider.GetRequiredService<IUnitOfWorkManager>();
+ using var uow = unitOfWorkManager.Begin(requiresNew: true);
+ var sampleRepository = scope.ServiceProvider.GetRequiredService<ISampleRepository>();
+ var count = await sampleRepository.GetCountAsync();
+
+ // 濡傛灉鏈夋洿鏂版暟鎹簱鎿嶄綔锛岄渶鎻愪氦淇濆瓨
+ // await uow.SaveChangesAsync();
+
+ _logger.LogInformation($"ProcessAsync锛孋ount={count}");
+ }
+ }
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi/FlowProcessors/WareCmsUtilityApiFlowProcessor.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi/FlowProcessors/WareCmsUtilityApiFlowProcessor.cs"
new file mode 100644
index 0000000..9f70e2e
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi/FlowProcessors/WareCmsUtilityApiFlowProcessor.cs"
@@ -0,0 +1,91 @@
+using CMS.Plugin.FlowManagement.Abstractions;
+using CMS.Plugin.FlowManagement.Abstractions.Models;
+using CMS.Plugin.MesSuite.Abstractions.Models;
+using CMS.Plugin.WareCmsUtilityApi.Domain.Samples;
+using CMS.Plugin.OrderManagement.Abstractions.Models;
+using CMS.Plugin.ProcessManagement.Abstractions.Models;
+using CMS.Plugin.TraceManagement.Abstractions.Models.Traces;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using SYC.Flow.Kernel;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Uow;
+
+namespace CMS.Plugin.WareCmsUtilityApi.FlowProcessors
+{
+ /// <summary>
+ /// 娴佺▼澶勭悊鍣�
+ /// </summary>
+ public class WareCmsUtilityApiFlowProcessor : IFlowProcessor, ISingletonDependency
+ {
+ private readonly ILogger<WareCmsUtilityApiFlowProcessor> _logger;
+ private readonly IServiceProvider _serviceProvider;
+
+ /// <summary>
+ /// Initializes a new instance of the <see cref="FlowProcessor"/> class.
+ /// </summary>
+ public WareCmsUtilityApiFlowProcessor(ILogger<WareCmsUtilityApiFlowProcessor> logger, IServiceProvider serviceProvider)
+ {
+ _logger = logger;
+ _serviceProvider = serviceProvider;
+ }
+
+ /// <inheritdoc />
+ public Task OnEnterAsync(FlowProcessor flowProcessor, object sender, EventArgs args)
+ {
+ return Task.CompletedTask;
+ }
+
+ /// <inheritdoc />
+ public async Task OnExecuteAsync(FlowProcessor flowProcessor, object sender, EventArgs args)
+ {
+ if (sender is Activity activity)
+ {
+ var eventArgs = args as ProcessflowEventArgs;
+ var procID = eventArgs.DataItems["Instance_ProcID"];
+ if (activity?.Name == "绗笁鏂圭郴缁熷悎鏍煎垽鏂�")
+ {
+ // 宸ヨ壓妯″瀷
+ var processModel = eventArgs.DataItems.ApplicationData as ProcessModel;
+
+ // 宸ュ崟妯″瀷
+ var orderModel = eventArgs.DataItems[FlowItemCollection.OrderModel] as OrderModel;
+
+ // 浜у搧妯″瀷
+ var productModel = eventArgs.DataItems[FlowItemCollection.ProductModel] as AssociationProductModel;
+
+ // 杩芥函妯″瀷
+ var traceModel = eventArgs.DataItems[FlowItemCollection.TraceModel] as TraceModel;
+
+ // 涓氬姟澶勭悊
+ await ProcessAsync();
+
+ _logger.LogInformation($"鎵ц娴佺▼锛氬疄渚�={procID} -> {flowProcessor.ProcName} -> {activity.Name} ProductionFlowProcessor");
+ }
+ }
+ }
+
+ /// <summary>
+ /// Processes the asynchronous.
+ /// </summary>
+ private async Task ProcessAsync()
+ {
+ using var scope = _serviceProvider.CreateScope();
+ var unitOfWorkManager = scope.ServiceProvider.GetRequiredService<IUnitOfWorkManager>();
+ using var uow = unitOfWorkManager.Begin(requiresNew: true);
+ var sampleRepository = scope.ServiceProvider.GetRequiredService<ISampleRepository>();
+ var count = await sampleRepository.GetCountAsync();
+
+ // 濡傛灉鏈夋洿鏂版暟鎹簱鎿嶄綔锛岄渶鎻愪氦淇濆瓨
+ // await uow.SaveChangesAsync();
+
+ _logger.LogInformation($"ProcessAsync锛孋ount={count}");
+ }
+
+ /// <inheritdoc />
+ public Task OnExitAsync(FlowProcessor flowProcessor, object sender, EventArgs args)
+ {
+ return Task.CompletedTask;
+ }
+ }
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi/Flows/50001_1.pfd" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi/Flows/50001_1.pfd"
new file mode 100644
index 0000000..6a5765d
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi/Flows/50001_1.pfd"
@@ -0,0 +1,158 @@
+<ProcessflowDefine Version="1">
+ <Define>
+ <ProcessflowBuilder xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+ <Parameters/>
+ <Name>WareCmsUtilityApi涓氬姟娴佺▼</Name>
+ <Description></Description>
+ <Root xsi:type="Activity">
+ <Alias>鍚姩</Alias>
+ <Name>鍚姩</Name>
+ <Description></Description>
+ <EnterMode>Automatic</EnterMode>
+ <ExitMode>Automatic</ExitMode>
+ <JoinType>JoinXOR</JoinType>
+ <SplitType>SplitXOR</SplitType>
+ <ExtendedProperty></ExtendedProperty>
+ </Root>
+ <Activities>
+ <Activity xsi:type="VariableMonitorActivity">
+ <Alias>鍙橀噺鐩戝惉</Alias>
+ <Name>瑙﹀彂淇″彿鐩戝惉</Name>
+ <EnterMode>Automatic</EnterMode>
+ <ExitMode>Automatic</ExitMode>
+ <JoinType>JoinXOR</JoinType>
+ <SplitType>SplitXOR</SplitType>
+ <NeedTagChange>true</NeedTagChange>
+ <TaskDelay>0</TaskDelay>
+ <MonitorVariableName>WareCmsUtilityApi_TriggerSignal</MonitorVariableName>
+ <CompareVariableValue>1</CompareVariableValue>
+ <ExtendedProperty></ExtendedProperty>
+ </Activity>
+ <Activity xsi:type="VariableReadActivity">
+ <Alias>鍙橀噺璇诲彇</Alias>
+ <Name>鍙橀噺璇诲彇</Name>
+ <EnterMode>Automatic</EnterMode>
+ <ExitMode>Automatic</ExitMode>
+ <JoinType>JoinXOR</JoinType>
+ <SplitType>SplitXOR</SplitType>
+ <TaskDelay>0</TaskDelay>
+ <ReadRetryCount>10</ReadRetryCount>
+ <ReadRetryDelay>500</ReadRetryDelay>
+ <ExtendedProperty></ExtendedProperty>
+ <ParameterVariables>
+ <ReadParameterVariable>
+ <VariableName>WareCmsUtilityApi_BarcodeVariable</VariableName>
+ <WriteIntoExtAttribute>true</WriteIntoExtAttribute>
+ </ReadParameterVariable>
+ </ParameterVariables>
+ </Activity>
+ <Activity xsi:type="WareCmsUtilityApiActivity">
+ <Alias>鍙橀噺鐩戝惉</Alias>
+ <Name>鎵╁睍姝ラ</Name>
+ <EnterMode>Automatic</EnterMode>
+ <ExitMode>Automatic</ExitMode>
+ <JoinType>JoinXOR</JoinType>
+ <SplitType>SplitXOR</SplitType>
+ <TaskDelay>0</TaskDelay>
+ <MyProperty>MyProperty1</MyProperty>
+ <ExtendedProperty></ExtendedProperty>
+ </Activity>
+ <Activity xsi:type="VariableMonitorActivity">
+ <Alias>鍙橀噺鐩戝惉</Alias>
+ <Name>瑙﹀彂淇″彿澶嶄綅鐩戝惉</Name>
+ <EnterMode>Automatic</EnterMode>
+ <ExitMode>Automatic</ExitMode>
+ <JoinType>JoinXOR</JoinType>
+ <SplitType>SplitXOR</SplitType>
+ <NeedTagChange>true</NeedTagChange>
+ <TaskDelay>0</TaskDelay>
+ <MonitorVariableName>WareCmsUtilityApi_TriggerSignal</MonitorVariableName>
+ <CompareVariableValue>0</CompareVariableValue>
+ <ExtendedProperty></ExtendedProperty>
+ </Activity>
+ <Activity xsi:type="BusinessActivity">
+ <Alias>閫氱敤姝ラ</Alias>
+ <Name>閫氱敤姝ラ</Name>
+ <EnterMode>Automatic</EnterMode>
+ <ExitMode>Automatic</ExitMode>
+ <JoinType>JoinXOR</JoinType>
+ <SplitType>SplitXOR</SplitType>
+ <PublishFlowEvent>true</PublishFlowEvent>
+ <TaskDelay>0</TaskDelay>
+ <ExtendedProperty>
+ <MyExtendedProperty>MyExtendedProperty1</MyExtendedProperty>
+ </ExtendedProperty>
+ </Activity>
+ <Activity xsi:type="VariableWriteActivity">
+ <Alias>鍙橀噺涓嬪彂</Alias>
+ <Name>鍙橀噺涓嬪彂</Name>
+ <EnterMode>Automatic</EnterMode>
+ <ExitMode>Automatic</ExitMode>
+ <JoinType>JoinXOR</JoinType>
+ <SplitType>SplitXOR</SplitType>
+ <TaskDelay>0</TaskDelay>
+ <WriteRetryCount>10</WriteRetryCount>
+ <WriteRetryDelay>500</WriteRetryDelay>
+ <ParameterVariables>
+ <WriteParameterVariable>
+ <Sort>1</Sort>
+ <WriteVariableName>WareCmsUtilityApi_BarcodeVariable</WriteVariableName>
+ <WriteVariableValue></WriteVariableValue>
+ </WriteParameterVariable>
+ </ParameterVariables>
+ <ExtendedProperty></ExtendedProperty>
+ </Activity>
+ <Activity xsi:type="EndActivity">
+ <Alias>缁撴潫</Alias>
+ <Name>缁撴潫</Name>
+ <EnterMode>Automatic</EnterMode>
+ <ExitMode>Automatic</ExitMode>
+ <JoinType>JoinXOR</JoinType>
+ <SplitType>SplitXOR</SplitType>
+ <ExtendedProperty></ExtendedProperty>
+ </Activity>
+ </Activities>
+ <Transitions>
+ <Transition>
+ <Label>鍚姩->瑙﹀彂淇″彿鐩戝惉</Label>
+ <Source>鍚姩</Source>
+ <Sink>瑙﹀彂淇″彿鐩戝惉</Sink>
+ </Transition>
+ <Transition>
+ <Label>瑙﹀彂淇″彿鐩戝惉->鍙橀噺璇诲彇</Label>
+ <Source>瑙﹀彂淇″彿鐩戝惉</Source>
+ <Sink>鍙橀噺璇诲彇</Sink>
+ </Transition>
+ <Transition>
+ <Label>鍙橀噺璇诲彇->鎵╁睍姝ラ</Label>
+ <Source>鍙橀噺璇诲彇</Source>
+ <Sink>鎵╁睍姝ラ</Sink>
+ </Transition>
+ <Transition>
+ <Label>鎵╁睍姝ラ->瑙﹀彂淇″彿澶嶄綅鐩戝惉</Label>
+ <Source>鎵╁睍姝ラ</Source>
+ <Sink>瑙﹀彂淇″彿澶嶄綅鐩戝惉</Sink>
+ </Transition>
+ <Transition>
+ <Label>瑙﹀彂淇″彿澶嶄綅鐩戝惉->閫氱敤姝ラ</Label>
+ <Source>瑙﹀彂淇″彿澶嶄綅鐩戝惉</Source>
+ <Sink>閫氱敤姝ラ</Sink>
+ </Transition>
+ <Transition>
+ <Label>閫氱敤姝ラ->鍙橀噺涓嬪彂</Label>
+ <Source>閫氱敤姝ラ</Source>
+ <Sink>鍙橀噺涓嬪彂</Sink>
+ </Transition>
+ <Transition>
+ <Label>鍙橀噺涓嬪彂->缁撴潫</Label>
+ <Source>鍙橀噺涓嬪彂</Source>
+ <Sink>缁撴潫</Sink>
+ </Transition>
+ </Transitions>
+ </ProcessflowBuilder>
+ </Define>
+ <Appearance>
+ <ProcessflowAppearance xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+ </ProcessflowAppearance>
+ </Appearance>
+</ProcessflowDefine>
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/Flows/FlowInfo.xml" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi/Flows/FlowInfo.xml"
similarity index 100%
rename from "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/Flows/FlowInfo.xml"
rename to "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi/Flows/FlowInfo.xml"
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Abstractions/FodyWeavers.xml" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi/FodyWeavers.xml"
similarity index 100%
copy from "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms.Abstractions/FodyWeavers.xml"
copy to "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi/FodyWeavers.xml"
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi/Jobs/WareCmsUtilityApiArgs.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi/Jobs/WareCmsUtilityApiArgs.cs"
new file mode 100644
index 0000000..0138baa
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi/Jobs/WareCmsUtilityApiArgs.cs"
@@ -0,0 +1,18 @@
+namespace CMS.Plugin.WareCmsUtilityApi.Jobs
+{
+ /// <summary>
+ /// WareCmsUtilityApi 浣滀笟鍙傛暟
+ /// </summary>
+ public class WareCmsUtilityApiArgs
+ {
+ /// <summary>
+ /// Gets or sets the subject.
+ /// </summary>
+ public string Subject { get; set; }
+
+ /// <summary>
+ /// Gets or sets the body.
+ /// </summary>
+ public string Body { get; set; }
+ }
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi/Jobs/WareCmsUtilityApiJob.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi/Jobs/WareCmsUtilityApiJob.cs"
new file mode 100644
index 0000000..86fa458
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi/Jobs/WareCmsUtilityApiJob.cs"
@@ -0,0 +1,43 @@
+using CMS.Plugin.WareCmsUtilityApi.Domain.Samples;
+using Microsoft.Extensions.Logging;
+using Volo.Abp.BackgroundJobs;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Uow;
+
+namespace CMS.Plugin.WareCmsUtilityApi.Jobs
+{
+ /// <summary>
+ /// WareCmsUtilityApi 鍚庡彴浣滀笟
+ /// </summary>
+ public class WareCmsUtilityApiJob : BackgroundJob<WareCmsUtilityApiArgs>, ITransientDependency
+ {
+ private readonly ILogger<WareCmsUtilityApiJob> _logger;
+ private readonly IUnitOfWorkManager _unitOfWorkManager;
+ private readonly ISampleRepository _sampleRepository;
+
+ /// <summary>
+ /// Initializes a new instance of the <see cref="WareCmsUtilityApiJob"/> class.
+ /// </summary>
+ /// <param name="logger">The logger.</param>
+ /// <param name="unitOfWorkManager">The unit of work manager.</param>
+ /// <param name="sampleRepository">My entity name repository.</param>
+ public WareCmsUtilityApiJob(ILogger<WareCmsUtilityApiJob> logger, IUnitOfWorkManager unitOfWorkManager, ISampleRepository sampleRepository)
+ {
+ _logger = logger;
+ _unitOfWorkManager = unitOfWorkManager;
+ _sampleRepository = sampleRepository;
+ }
+
+ /// <inheritdoc />
+ public override void Execute(WareCmsUtilityApiArgs args)
+ {
+ using var uow = _unitOfWorkManager.Begin(requiresNew: true);
+ var count = _sampleRepository.GetCountAsync().GetAwaiter().GetResult();
+
+ // 濡傛灉鏈夋洿鏂版暟鎹簱鎿嶄綔锛岄渶鎻愪氦淇濆瓨
+ // uow.SaveChangesAsync().GetAwaiter().GetResult();
+
+ _logger.LogInformation($"WareCmsUtilityApiJob Execute锛孲ubject={args.Subject}锛孊ody={args.Body}锛孋ount={count}");
+ }
+ }
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi/ProjectService/WareCmsUtilityApiProjectService.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi/ProjectService/WareCmsUtilityApiProjectService.cs"
new file mode 100644
index 0000000..7175bdc
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi/ProjectService/WareCmsUtilityApiProjectService.cs"
@@ -0,0 +1,184 @@
+using CMS.Plugin.FlowManagement.Abstractions.FlowBusiness;
+using CMS.Plugin.WareCmsUtilityApi.Apis;
+using CMS.Plugin.WareCmsUtilityApi.Application.Contracts.Dtos.Samples;
+using CMS.Plugin.WareCmsUtilityApi.Domain.Samples;
+using CMS.Plugin.WareCmsUtilityApi.Jobs;
+using CMS.Project;
+using CMS.Project.Abstractions;
+using CMS.Unit.RuntimeValue.Abstractions;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Volo.Abp.BackgroundJobs;
+using Volo.Abp.Uow;
+
+namespace CMS.Plugin.WareCmsUtilityApi.ProjectService
+{
+ /// <summary>
+ /// 宸ョ▼鏈嶅姟锛屽拰宸ョ▼鍏宠仈鐨勫悗鍙版湇鍔★紝褰�<see cref="IProjectServiceRunner"/>浠ュ綋鍓岾ey璋冪敤鏃朵細琚墽琛�
+ /// </summary>
+ public class WareCmsUtilityApiProjectService : BaseProjectService
+ {
+ private IServiceProvider _serviceProvider;
+ private readonly ILogger<WareCmsUtilityApiProjectService> _logger;
+ private readonly IVariableDataCache _variableDataCache;
+ private FlowVariableChannelListener _channelListener;
+ private Dictionary<string, string> _monitorVariableNames;
+
+ /// <summary>
+ /// 鏈嶅姟鐨凨ey锛屽敮涓�锛屼緵<see cref="IProjectServiceRunner"/>浣跨敤
+ /// </summary>
+ public override string Key => "WareCmsUtilityApi";
+
+ /// <summary>
+ /// 鏈嶅姟鎻忚堪锛屾樉绀哄湪鏈嶅姟鍒楄〃UI涓婄殑鍚嶇О
+ /// </summary>
+ public override string Description => "WareCmsUtilityApi鏈嶅姟";
+
+ /// <summary>
+ /// 鍚敤鎺堟潈
+ /// </summary>
+ public override bool AuthRequired => true;
+
+ /// <summary>
+ /// Initializes a new instance of the <see cref="WareCmsUtilityApiProjectService"/> class.
+ /// </summary>
+ /// <param name="logger">The logger.</param>
+ /// <param name="variableDataCache">The variable data cache.</param>
+ public WareCmsUtilityApiProjectService(IServiceProvider serviceProvider, ILogger<WareCmsUtilityApiProjectService> logger, IVariableDataCache variableDataCache)
+ {
+ _serviceProvider = serviceProvider;
+ _logger = logger;
+ _variableDataCache = variableDataCache;
+ }
+
+ /// <summary>
+ /// 寮�鍚湇鍔�
+ /// </summary>
+ /// <param name="serviceProvider">鍏锋湁宸ョ▼涓婁笅鏂囩殑瀹炰緥</param>
+ public override async Task StartAsync(IServiceProvider serviceProvider)
+ {
+ if (State == ProjectServiceState.Started)
+ {
+ return;
+ }
+
+ // 鐩戝惉鍙橀噺
+ _monitorVariableNames = new Dictionary<string, string>
+ {
+ { "WareCmsUtilityApi_Variable1", "鐩戝惉鍙橀噺1" },
+ { "WareCmsUtilityApi_Variable2", "鐩戝惉鍙橀噺2" }
+ };
+
+ // 鍒涘缓閫氶亾鐩戝惉
+ _channelListener?.Token?.Dispose();
+ _channelListener = new FlowVariableChannelListener(_logger, _variableDataCache);
+ _channelListener.CreateChannel(Key, waitListener: false, timeout: TimeSpan.FromSeconds(30), variableFilter: _monitorVariableNames.Keys.ToHashSet());
+ _channelListener.TagChanged += OnTagValueChanged;
+
+ await base.StartAsync(serviceProvider);
+ }
+
+ /// <summary>
+ /// 鍋滄鏈嶅姟
+ /// </summary>
+ /// <param name="serviceProvider">鍏锋湁宸ョ▼涓婁笅鏂囩殑瀹炰緥</param>
+ public override async Task StopAsync(IServiceProvider serviceProvider)
+ {
+ if (_channelListener != null)
+ {
+ // 閲婃斁鐩戝惉
+ _channelListener.TagChanged -= OnTagValueChanged;
+ _channelListener.Token.Dispose();
+ _channelListener = null;
+ }
+
+ // 浣跨敤鍚庡彴浣滀笟寮傛澶勭悊
+ //await _serviceProvider.GetRequiredService<IBackgroundJobManager>().EnqueueAsync(new WareCmsUtilityApiArgs
+ //{
+ // Subject = "WareCmsUtilityApi_Subject",
+ // Body = "WareCmsUtilityApi_Body",
+ //});
+
+
+ await base.StopAsync(serviceProvider);
+ }
+
+ /// <summary>
+ /// Called when [tag value changed].
+ /// </summary>
+ /// <param name="sender">The sender.</param>
+ /// <param name="e">The <see cref="TagChangedEventArgs"/> instance containing the event data.</param>
+ private async void OnTagValueChanged(object sender, TagChangedEventArgs e)
+ {
+ var changeds = e.Changeds.Where(x => _monitorVariableNames != null && _monitorVariableNames.ContainsKey(x.Name));
+ if (!changeds.Any())
+ {
+ return;
+ }
+
+ foreach (var changed in changeds)
+ {
+ var oldValue = changed.Old?.Value;
+ var newValue = changed.New?.Value;
+ var traceId = e.TraceId;
+
+ _logger.LogInformation($"{changed.Name} 鍙橀噺鍊煎彂鐢熷彉鍖栵紝鏃у�納oldValue}=鏂板�納newValue}锛孴raceId={traceId}");
+
+ // TODO: 澶勭悊鍙橀噺鍊煎彉鍖�
+ // Tips锛歨ttps://cms-docs.shengyc.com/cms/api/%E5%90%8E%E7%AB%AF#3-%E5%8F%98%E9%87%8F%E6%A8%A1%E5%9D%97
+ /* 璇存槑锛氶�氳繃璁㈤槄 IVariableDataCache.TagChanged 浜嬩欢锛屾偍鍙互瀹炴椂鐩戞帶鍙橀噺鐨勫彉鍖栥�傛浜嬩欢浼氫紶閫掓墍鏈夊彉閲忚嚦浜嬩欢澶勭悊鍑芥暟锛屽洜姝わ紝涓氬姟灞傞渶鍦ㄥ嚱鏁颁腑绛涢�夊叧娉ㄧ殑鍙橀噺銆�
+ 娉ㄦ剰浜嬮」锛�
+ 锛�1锛夋�ц兘褰卞搷锛� 鍙戝竷浜嬩欢鏃讹紝浜嬩欢鐨勫彂閫佽�呭皢闃诲娴佺▼銆傚洜姝わ紝寮虹儓寤鸿閬垮厤鍦ㄤ簨浠跺鐞嗗嚱鏁颁腑鎵ц I/ O 鎿嶄綔銆丠TTP 鎺ュ彛璁块棶鎴栧叾浠栬�楁椂鎿嶄綔锛屼互闃叉瀵圭郴缁熸�ц兘浜х敓涓ラ噸褰卞搷锛屽鑷存暣涓郴缁熷搷搴斿欢杩熴��
+ 锛�2锛夐珮棰戠巼瑙﹀彂锛� 鐢变簬浜嬩欢璁㈤槄浜嗗叏閲忓彉閲忥紝瑙﹀彂棰戠巼鍙兘闈炲父楂樸��
+ 锛�3锛夊紓姝ュ鐞嗭細 閴翠簬浜嬩欢瑙﹀彂棰戠巼寰堥珮锛屽缓璁笟鍔″眰鍦ㄧ瓫閫夊叧娉ㄥ彉閲忓悗锛屼娇鐢� Task 鍚姩鏂扮嚎绋嬪鐞嗕笟鍔￠�昏緫锛屼互閬垮厤闃诲鏍稿績鐨勫彉閲忕洃鍚姛鑳斤紝瀹炵幇涓氬姟灞備笌骞冲彴鍩哄骇鐨勮В鑰︺��
+ 锛�4锛夊苟鍙戠鐞嗭細 濡傛灉涓氬姟灞傚苟鍙戦噺澶э紝蹇呴』浼樺寲浠ｇ爜璁捐鍜屽疄鏂斤紝浠ュ噺灏戝湪楂樺苟鍙戞儏鍐典笅鐨勭郴缁熻祫婧愭秷鑰楋紝闃叉绯荤粺鎬ц兘闂銆�
+ 锛�5锛変唬鐮佸畨鍏細 瀹夎骞朵娇鐢� CMS.CodeAnalysis 鍒嗘瀽鍣ㄦ潵鍒嗘瀽 IVariableDataCache.TagChanged 鐨勪娇鐢ㄦ儏鍐点�傝宸ュ叿鑳藉湪浣跨敤涓嶅綋鏃舵彁渚涚紪璇戦敊璇紝甯姪鎮ㄦ彁楂樹唬鐮佽川閲忋��*/
+
+ _ = Task.Run(async () =>
+ {
+ // 渚�1锛氬悓姝ュ鐞�
+ //await ProcessAsync();
+
+ // 渚�2锛氳皟鐢ㄥ閮ˋPI
+ //await ExecuteExternalApiAsync();
+ });
+ }
+ }
+
+ /// <summary>
+ /// Processes the asynchronous.
+ /// </summary>
+ private async Task ProcessAsync()
+ {
+ using var scope = _serviceProvider.CreateScope();
+ var unitOfWorkManager = scope.ServiceProvider.GetRequiredService<IUnitOfWorkManager>();
+ using var uow = unitOfWorkManager.Begin(requiresNew: true);
+ var sampleRepository = scope.ServiceProvider.GetRequiredService<ISampleRepository>();
+ var count = await sampleRepository.GetCountAsync();
+
+ // 濡傛灉鏈夋洿鏂版暟鎹簱鎿嶄綔锛岄渶鎻愪氦淇濆瓨
+ // await uow.SaveChangesAsync();
+
+ _logger.LogInformation($"ProcessAsync锛孋ount={count}");
+ }
+
+ /// <summary>
+ /// Executes the external API.
+ /// </summary>
+ private async Task ExecuteExternalApiAsync()
+ {
+ try
+ {
+ await _serviceProvider.GetRequiredService<IWareCmsUtilityApiExternalApi>().CreateAsync(new SampleCreateDto
+ {
+ Name = "Sample_Name",
+ Code = "Sample_Code",
+ });
+ }
+ catch (Exception e)
+ {
+ _logger.LogException(e);
+ }
+ }
+ }
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/Properties/launchSettings.json" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi/Properties/launchSettings.json"
similarity index 100%
rename from "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/src/CMS.Plugin.HIAWms/Properties/launchSettings.json"
rename to "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi/Properties/launchSettings.json"
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi/Resources/Templates/Sample\345\257\274\345\207\272\346\250\241\346\235\277.xlsx" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi/Resources/Templates/Sample\345\257\274\345\207\272\346\250\241\346\235\277.xlsx"
new file mode 100644
index 0000000..ca8c2ef
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi/Resources/Templates/Sample\345\257\274\345\207\272\346\250\241\346\235\277.xlsx"
Binary files differ
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi/Services/WareCmsUtilityApiFlowService.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi/Services/WareCmsUtilityApiFlowService.cs"
new file mode 100644
index 0000000..58b22d0
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi/Services/WareCmsUtilityApiFlowService.cs"
@@ -0,0 +1,43 @@
+using CMS.Plugin.WareCmsUtilityApi.Abstractions;
+using CMS.Plugin.WareCmsUtilityApi.Domain.Samples;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using SYC.Flow.Kernel;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Uow;
+
+namespace CMS.Plugin.WareCmsUtilityApi.Services
+{
+ /// <inheritdoc />
+ public class WareCmsUtilityApiFlowService : IWareCmsUtilityApiFlowService, ITransientDependency
+ {
+ private readonly ILogger<WareCmsUtilityApiFlowService> _logger;
+ private readonly IServiceProvider _serviceProvider;
+
+ /// <summary>
+ /// Initializes a new instance of the <see cref="WareCmsUtilityApiFlowService"/> class.
+ /// </summary>
+ /// <param name="logger">The logger.</param>
+ public WareCmsUtilityApiFlowService(ILogger<WareCmsUtilityApiFlowService> logger, IServiceProvider serviceProvider)
+ {
+ _logger = logger;
+ _serviceProvider = serviceProvider;
+ }
+
+ /// <inheritdoc />
+ public async Task ProcessAsync(ProcessflowEventArgs args)
+ {
+ using var scope = _serviceProvider.CreateScope();
+ var unitOfWorkManager = scope.ServiceProvider.GetRequiredService<IUnitOfWorkManager>();
+ using var uow = unitOfWorkManager.Begin(requiresNew: true);
+ var sampleRepository = scope.ServiceProvider.GetRequiredService<ISampleRepository>();
+ var count = await sampleRepository.GetCountAsync();
+
+ // 濡傛灉鏈夋洿鏂版暟鎹簱鎿嶄綔锛岄渶鎻愪氦淇濆瓨
+ // await uow.SaveChangesAsync();
+
+ // 杈撳嚭鏃ュ織
+ _logger.LogInformation($"WareCmsUtilityApiFlowService锛歅rocessAsync()");
+ }
+ }
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi/Workers/WareCmsUtilityApiWorker.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi/Workers/WareCmsUtilityApiWorker.cs"
new file mode 100644
index 0000000..e525879
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi/Workers/WareCmsUtilityApiWorker.cs"
@@ -0,0 +1,76 @@
+using CMS.Extensions.Variable;
+using CMS.Project.Abstractions;
+using KissUtil.Extensions;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Volo.Abp.BackgroundWorkers;
+using Volo.Abp.Threading;
+
+namespace CMS.Plugin.WareCmsUtilityApi.Workers
+{
+ /// <summary>
+ /// WareCmsUtilityApi鍚庡彴宸ヤ綔鑰�
+ /// </summary>
+ public class WareCmsUtilityApiWorker : AsyncPeriodicBackgroundWorkerBase
+ {
+ private readonly ILogger<WareCmsUtilityApiWorker> _logger;
+ private readonly VariableService _variableService;
+
+ /// <summary>
+ /// Initializes a new instance of the <see cref="WareCmsUtilityApiWorker"/> class.
+ /// </summary>
+ /// <param name="timer">The timer.</param>
+ /// <param name="serviceScopeFactory">The service scope factory.</param>
+ public WareCmsUtilityApiWorker(ILogger<WareCmsUtilityApiWorker> logger, AbpAsyncTimer timer, VariableService variableService, IServiceScopeFactory serviceScopeFactory) : base(timer, serviceScopeFactory)
+ {
+ _logger = logger;
+ _variableService = variableService;
+ Timer.Period = 1 * 300 * 1000; // 姣忛殧 300 绉� 鎵ц涓�娆�
+ Timer.RunOnStart = true;
+ }
+
+ /// <inheritdoc />
+ protected override async Task DoWorkAsync(PeriodicBackgroundWorkerContext workerContext)
+ {
+ var projectAccessor = workerContext.ServiceProvider.GetRequiredService<IProjectAccessor>();
+ var project = await projectAccessor.GetProjectAsync();
+ if (project?.Info == null)
+ {
+ return;
+ }
+
+ //_logger.LogInformation($"WareCmsUtilityApiWorker is working for project {project.Info.Id}");
+
+ //// 璁＄畻OEE
+ //double oee = await CalculateOEEAsync();
+
+ //// 浣跨敤鐧惧垎姣旀牸寮� 鎵撳嵃缁撴灉鏃ュ織
+ //_logger.LogInformation($"OEE:{oee:P2}");
+
+ //// 鍐欏叆鍙橀噺
+ //await _variableService.WriteValueAsync(new Dictionary<string, object> {{ "OEE", oee } });
+ }
+
+ // 璁＄畻OEE=鍙敤鎬楁�ц兘脳璐ㄩ噺
+ public async Task<double> CalculateOEEAsync()
+ {
+ // 璇诲彇OEE璁＄畻鎵�闇�鐨勫��
+ double availability = await ReadDoubleValueAsync("Availability");
+ double performance = await ReadDoubleValueAsync("Performance");
+ double quality = await ReadDoubleValueAsync("Quality");
+
+ // 璁＄畻OEE
+ double oee = availability * performance * quality;
+
+ // 杩斿洖璁＄畻缁撴灉
+ return oee;
+ }
+
+ // 鎻愪緵涓�涓硾鍨嬫柟娉曪紝鏂逛究鐩存帴鑾峰彇double绫诲瀷鐨勫��
+ public async Task<double> ReadDoubleValueAsync(string variableName)
+ {
+ var variable = await _variableService.ReadValueAsync(variableName);
+ return (variable?.Content?.Value).SafeString().ToDoubleOrNull().GetValueOrDefault();
+ }
+ }
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi/appsettings.json" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi/appsettings.json"
new file mode 100644
index 0000000..37f74dd
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/src/CMS.Plugin.WareCmsUtilityApi/appsettings.json"
@@ -0,0 +1,6 @@
+{
+ // 閰嶇疆鏂囦欢灏藉彲鑳藉啓鍦�/host/appsettings.json鎴栨暟鎹簱涓紝閬垮厤鎻掍欢鍗囩骇鏃惰瑕嗙洊
+ "IWareCmsUtilityApiExternalApi": {
+ "HttpHost": "http://127.0.0.1:18000/" // External API瀵规帴鍦板潃
+ }
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/stylecop.json" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/stylecop.json"
similarity index 100%
rename from "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/UtilityApi/stylecop.json"
rename to "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/stylecop.json"
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/test/CMS.Plugin.WareCmsUtilityApi.Application.Tests/CMS.Plugin.WareCmsUtilityApi.Application.Tests.csproj" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/test/CMS.Plugin.WareCmsUtilityApi.Application.Tests/CMS.Plugin.WareCmsUtilityApi.Application.Tests.csproj"
new file mode 100644
index 0000000..8b278d7
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/test/CMS.Plugin.WareCmsUtilityApi.Application.Tests/CMS.Plugin.WareCmsUtilityApi.Application.Tests.csproj"
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+ <Import Project="../../common.test.props" />
+
+ <PropertyGroup>
+ <TargetFramework>net6.0</TargetFramework>
+ </PropertyGroup>
+
+ <ItemGroup>
+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
+ </ItemGroup>
+
+ <ItemGroup>
+ <ProjectReference Include="..\..\src\CMS.Plugin.WareCmsUtilityApi.Application\CMS.Plugin.WareCmsUtilityApi.Application.csproj" />
+ <ProjectReference Include="..\CMS.Plugin.WareCmsUtilityApi.Domain.Tests\CMS.Plugin.WareCmsUtilityApi.Domain.Tests.csproj" />
+ </ItemGroup>
+
+</Project>
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/test/CMS.Plugin.WareCmsUtilityApi.Application.Tests/WareCmsUtilityApiApplicationTestBase.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/test/CMS.Plugin.WareCmsUtilityApi.Application.Tests/WareCmsUtilityApiApplicationTestBase.cs"
new file mode 100644
index 0000000..90e1d17
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/test/CMS.Plugin.WareCmsUtilityApi.Application.Tests/WareCmsUtilityApiApplicationTestBase.cs"
@@ -0,0 +1,38 @@
+using CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore;
+using CMS.Plugin.WareCmsUtilityApi.MySQL;
+using CMS.Plugin.WareCmsUtilityApi.TestBase;
+
+namespace CMS.Plugin.WareCmsUtilityApi.Application.Tests
+{
+ /// <summary>
+ /// WareCmsUtilityApiApplicationTestBase
+ /// </summary>
+ public class WareCmsUtilityApiApplicationTestBase : WareCmsUtilityApiTestBase<WareCmsUtilityApiApplicationTestModule>
+ {
+ /// <summary>
+ /// UsingDbContext
+ /// </summary>
+ /// <param name="action">IWareCmsUtilityApiDbContext</param>
+ protected virtual void UsingDbContext(Action<CMSPluginDbContext> action)
+ {
+ using (var dbContext = GetRequiredService<CMSPluginDbContext>())
+ {
+ action.Invoke(dbContext);
+ }
+ }
+
+ /// <summary>
+ /// UsingDbContext
+ /// </summary>
+ /// <typeparam name="T">T</typeparam>
+ /// <param name="action">IWareCmsUtilityApiDbContext</param>
+ /// <returns>T</returns>
+ protected virtual T UsingDbContext<T>(Func<CMSPluginDbContext, T> action)
+ {
+ using (var dbContext = GetRequiredService<CMSPluginDbContext>())
+ {
+ return action.Invoke(dbContext);
+ }
+ }
+ }
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/test/CMS.Plugin.WareCmsUtilityApi.Application.Tests/WareCmsUtilityApiApplicationTestModule.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/test/CMS.Plugin.WareCmsUtilityApi.Application.Tests/WareCmsUtilityApiApplicationTestModule.cs"
new file mode 100644
index 0000000..47d1e41
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/test/CMS.Plugin.WareCmsUtilityApi.Application.Tests/WareCmsUtilityApiApplicationTestModule.cs"
@@ -0,0 +1,19 @@
+using CMS.Plugin.WareCmsUtilityApi.Domain.Tests;
+using Volo.Abp.Modularity;
+
+namespace CMS.Plugin.WareCmsUtilityApi.Application.Tests
+{
+ /// <summary>
+ /// WareCmsUtilityApiApplicationTestModule
+ /// </summary>
+ [DependsOn(
+ typeof(CMSPluginApplicationModule),
+ typeof(WareCmsUtilityApiDomainTestModule))]
+ public class WareCmsUtilityApiApplicationTestModule : AbpModule
+ {
+ public override void ConfigureServices(ServiceConfigurationContext context)
+ {
+ base.ConfigureServices(context);
+ }
+ }
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/test/CMS.Plugin.WareCmsUtilityApi.Domain.Tests/CMS.Plugin.WareCmsUtilityApi.Domain.Tests.csproj" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/test/CMS.Plugin.WareCmsUtilityApi.Domain.Tests/CMS.Plugin.WareCmsUtilityApi.Domain.Tests.csproj"
new file mode 100644
index 0000000..28ae593
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/test/CMS.Plugin.WareCmsUtilityApi.Domain.Tests/CMS.Plugin.WareCmsUtilityApi.Domain.Tests.csproj"
@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk">
+ <Import Project="../../common.test.props" />
+
+ <PropertyGroup>
+ <TargetFramework>net6.0</TargetFramework>
+ </PropertyGroup>
+
+ <ItemGroup>
+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkPackageVersion)" />
+ </ItemGroup>
+
+ <ItemGroup>
+ <ProjectReference Include="..\CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore.Tests\CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore.Tests.csproj" />
+ </ItemGroup>
+
+</Project>
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/test/CMS.Plugin.WareCmsUtilityApi.Domain.Tests/WareCmsUtilityApiDomainTestBase.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/test/CMS.Plugin.WareCmsUtilityApi.Domain.Tests/WareCmsUtilityApiDomainTestBase.cs"
new file mode 100644
index 0000000..1a35554
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/test/CMS.Plugin.WareCmsUtilityApi.Domain.Tests/WareCmsUtilityApiDomainTestBase.cs"
@@ -0,0 +1,38 @@
+using CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore;
+using CMS.Plugin.WareCmsUtilityApi.MySQL;
+using CMS.Plugin.WareCmsUtilityApi.TestBase;
+
+namespace CMS.Plugin.WareCmsUtilityApi.Domain.Tests
+{
+ /// <summary>
+ /// WareCmsUtilityApi DomainTestBase
+ /// </summary>
+ public class WareCmsUtilityApiDomainTestBase : WareCmsUtilityApiTestBase<WareCmsUtilityApiDomainTestModule>
+ {
+ /// <summary>
+ /// UsingDbContext
+ /// </summary>
+ /// <param name="action">IWareCmsUtilityApiDbContext</param>
+ protected virtual void UsingDbContext(Action<CMSPluginDbContext> action)
+ {
+ using (var dbContext = GetRequiredService<CMSPluginDbContext>())
+ {
+ action.Invoke(dbContext);
+ }
+ }
+
+ /// <summary>
+ /// UsingDbContext
+ /// </summary>
+ /// <typeparam name="T">T</typeparam>
+ /// <param name="action">IWareCmsUtilityApiDbContext</param>
+ /// <returns>T</returns>
+ protected virtual T UsingDbContext<T>(Func<CMSPluginDbContext, T> action)
+ {
+ using (var dbContext = GetRequiredService<CMSPluginDbContext>())
+ {
+ return action.Invoke(dbContext);
+ }
+ }
+ }
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/test/CMS.Plugin.WareCmsUtilityApi.Domain.Tests/WareCmsUtilityApiDomainTestModule.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/test/CMS.Plugin.WareCmsUtilityApi.Domain.Tests/WareCmsUtilityApiDomainTestModule.cs"
new file mode 100644
index 0000000..9d3e8d7
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/test/CMS.Plugin.WareCmsUtilityApi.Domain.Tests/WareCmsUtilityApiDomainTestModule.cs"
@@ -0,0 +1,13 @@
+using CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore.Tests;
+using Volo.Abp.Modularity;
+
+namespace CMS.Plugin.WareCmsUtilityApi.Domain.Tests
+{
+ /// <summary>
+ /// WareCmsUtilityApi DomainTestModule
+ /// </summary>
+ [DependsOn(typeof(WareCmsUtilityApiTestEntityFrameworkCoreModule))]
+ public class WareCmsUtilityApiDomainTestModule : AbpModule
+ {
+ }
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/test/CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore.Tests/CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore.Tests.csproj" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/test/CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore.Tests/CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore.Tests.csproj"
new file mode 100644
index 0000000..96f6946
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/test/CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore.Tests/CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore.Tests.csproj"
@@ -0,0 +1,25 @@
+<Project Sdk="Microsoft.NET.Sdk">
+ <Import Project="../../common.test.props" />
+
+ <PropertyGroup>
+ <TargetFramework>net6.0</TargetFramework>
+ </PropertyGroup>
+
+ <ItemGroup>
+ <PackageReference Include="Volo.Abp.EntityFrameworkCore" Version="$(ABPPackageVersion)" />
+ <PackageReference Include="Volo.Abp.EntityFrameworkCore.Sqlite" Version="$(ABPPackageVersion)" />
+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkPackageVersion)" />
+ <PackageReference Include="NSubstitute" Version="$(NSubstitutePackageVersion)" />
+ <PackageReference Include="Shouldly" Version="$(ShouldlyPackageVersion)" />
+ <PackageReference Include="xunit" Version="$(xUnitPackageVersion)" />
+ <PackageReference Include="xunit.extensibility.execution" Version="$(xUnitExtensibilityExecutionPackageVersion)" />
+ <PackageReference Include="xunit.runner.visualstudio" Version="$(xUnitRunnerVisualstudioPackageVersion)" />
+ </ItemGroup>
+
+ <ItemGroup>
+ <ProjectReference Include="..\..\src\CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore\CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore.csproj" />
+ <ProjectReference Include="..\..\src\CMS.Plugin.WareCmsUtilityApi.MySQL\CMS.Plugin.WareCmsUtilityApi.MySQL.csproj" />
+ <ProjectReference Include="..\CMS.Plugin.WareCmsUtilityApi.TestBase\CMS.Plugin.WareCmsUtilityApi.TestBase.csproj" />
+ </ItemGroup>
+
+</Project>
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/test/CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore.Tests/WareCmsUtilityApiEntityFrameworkTestBase.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/test/CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore.Tests/WareCmsUtilityApiEntityFrameworkTestBase.cs"
new file mode 100644
index 0000000..983dc4f
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/test/CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore.Tests/WareCmsUtilityApiEntityFrameworkTestBase.cs"
@@ -0,0 +1,11 @@
+using CMS.Plugin.WareCmsUtilityApi.TestBase;
+
+namespace CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore.Tests
+{
+ /// <summary>
+ /// MyProjectName TestBase
+ /// </summary>
+ public class WareCmsUtilityApiEntityFrameworkTestBase : WareCmsUtilityApiTestBase<WareCmsUtilityApiTestEntityFrameworkCoreModule>
+ {
+ }
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/test/CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore.Tests/WareCmsUtilityApiTestEntityFrameworkCoreModule.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/test/CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore.Tests/WareCmsUtilityApiTestEntityFrameworkCoreModule.cs"
new file mode 100644
index 0000000..afa71f5
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/test/CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore.Tests/WareCmsUtilityApiTestEntityFrameworkCoreModule.cs"
@@ -0,0 +1,50 @@
+using CMS.Plugin.WareCmsUtilityApi.MySQL;
+using CMS.Plugin.WareCmsUtilityApi.TestBase;
+using Microsoft.Data.Sqlite;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Storage;
+using Volo.Abp.EntityFrameworkCore;
+using Volo.Abp.EntityFrameworkCore.Sqlite;
+using Volo.Abp.Modularity;
+
+namespace CMS.Plugin.WareCmsUtilityApi.EntityFrameworkCore.Tests
+{
+ /// <summary>
+ /// MyProjectName TestEntityFrameworkCoreModule
+ /// </summary>
+ [DependsOn(
+ typeof(WareCmsUtilityApiTestBaseModule),
+ typeof(CMSPluginEntityFrameworkCoreModule),
+ typeof(AbpEntityFrameworkCoreSqliteModule))]
+ public class WareCmsUtilityApiTestEntityFrameworkCoreModule : AbpModule
+ {
+ /// <summary>
+ /// ConfigureServices
+ /// </summary>
+ /// <param name="context">ServiceConfigurationContext</param>
+ public override void ConfigureServices(ServiceConfigurationContext context)
+ {
+ var sqliteConnection = CreateDatabaseAndGetConnection();
+
+ Configure<AbpDbContextOptions>(options =>
+ {
+ options.Configure(dbContextConfigurationContext =>
+ {
+ dbContextConfigurationContext.DbContextOptions.UseSqlite(sqliteConnection);
+ });
+ });
+ }
+
+ private static SqliteConnection CreateDatabaseAndGetConnection()
+ {
+ var connection = new SqliteConnection("Data Source=:memory:");
+ connection.Open();
+
+ new CMSPluginDbContext(
+ new DbContextOptionsBuilder<CMSPluginDbContext>().UseSqlite(connection).Options).GetService<IRelationalDatabaseCreator>().CreateTables();
+
+ return connection;
+ }
+ }
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/test/CMS.Plugin.WareCmsUtilityApi.TestBase/CMS.Plugin.WareCmsUtilityApi.TestBase.csproj" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/test/CMS.Plugin.WareCmsUtilityApi.TestBase/CMS.Plugin.WareCmsUtilityApi.TestBase.csproj"
new file mode 100644
index 0000000..a8f5e7b
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/test/CMS.Plugin.WareCmsUtilityApi.TestBase/CMS.Plugin.WareCmsUtilityApi.TestBase.csproj"
@@ -0,0 +1,23 @@
+<Project Sdk="Microsoft.NET.Sdk">
+ <Import Project="../../common.test.props" />
+
+ <PropertyGroup>
+ <TargetFramework>net6.0</TargetFramework>
+ </PropertyGroup>
+
+ <ItemGroup>
+ <PackageReference Include="Volo.Abp.Autofac" Version="$(ABPPackageVersion)" />
+ <PackageReference Include="Volo.Abp.TestBase" Version="$(ABPPackageVersion)" />
+ <PackageReference Include="Volo.Abp.Authorization" Version="$(ABPPackageVersion)" />
+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkPackageVersion)" />
+ <PackageReference Include="NSubstitute" Version="$(NSubstitutePackageVersion)" />
+ <PackageReference Include="Shouldly" Version="$(ShouldlyPackageVersion)" />
+ <PackageReference Include="xunit" Version="$(xUnitPackageVersion)" />
+ <PackageReference Include="xunit.extensibility.execution" Version="$(xUnitExtensibilityExecutionPackageVersion)" />
+ <PackageReference Include="xunit.runner.visualstudio" Version="$(xUnitRunnerVisualstudioPackageVersion)" />
+ </ItemGroup>
+
+ <ItemGroup>
+ <ProjectReference Include="..\..\src\CMS.Plugin.WareCmsUtilityApi.Domain\CMS.Plugin.WareCmsUtilityApi.Domain.csproj" />
+ </ItemGroup>
+</Project>
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/test/CMS.Plugin.WareCmsUtilityApi.TestBase/WareCmsUtilityApiDataSeedContributor.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/test/CMS.Plugin.WareCmsUtilityApi.TestBase/WareCmsUtilityApiDataSeedContributor.cs"
new file mode 100644
index 0000000..9bfc73e
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/test/CMS.Plugin.WareCmsUtilityApi.TestBase/WareCmsUtilityApiDataSeedContributor.cs"
@@ -0,0 +1,35 @@
+using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp.Data;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Guids;
+
+namespace CMS.Plugin.WareCmsUtilityApi.TestBase
+{
+ /// <summary>
+ /// MyProjectName DataSeedContributor
+ /// </summary>
+ public class WareCmsUtilityApiDataSeedContributor : IDataSeedContributor, ITransientDependency
+ {
+ private readonly WareCmsUtilityApiTestData _myProjectNameTestData;
+ private readonly IGuidGenerator _guidGenerator;
+ /// <summary>
+ /// Initializes a new instance of the <see cref="WareCmsUtilityApiDataSeedContributor"/> class.
+ /// </summary>
+ /// <param name="serviceProvider">IServiceProvider</param>
+ public WareCmsUtilityApiDataSeedContributor(IServiceProvider serviceProvider)
+ {
+ _myProjectNameTestData = serviceProvider.GetRequiredService<WareCmsUtilityApiTestData>();
+ _guidGenerator = serviceProvider.GetRequiredService<IGuidGenerator>();
+ }
+
+ /// <summary>
+ /// SeedAsync
+ /// </summary>
+ /// <param name="context">DataSeedContext</param>
+ /// <returns>Task</returns>
+ public async Task SeedAsync(DataSeedContext context)
+ {
+ await Task.CompletedTask;
+ }
+ }
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/test/CMS.Plugin.WareCmsUtilityApi.TestBase/WareCmsUtilityApiTestBase.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/test/CMS.Plugin.WareCmsUtilityApi.TestBase/WareCmsUtilityApiTestBase.cs"
new file mode 100644
index 0000000..68e3081
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/test/CMS.Plugin.WareCmsUtilityApi.TestBase/WareCmsUtilityApiTestBase.cs"
@@ -0,0 +1,89 @@
+using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp;
+using Volo.Abp.Modularity;
+using Volo.Abp.Testing;
+using Volo.Abp.Uow;
+
+namespace CMS.Plugin.WareCmsUtilityApi.TestBase
+{
+ /// <summary>
+ /// MyProjectName TestBase
+ /// </summary>
+ /// <typeparam name="TStartupModule">IAbpModule</typeparam>
+ public class WareCmsUtilityApiTestBase<TStartupModule> : AbpIntegratedTest<TStartupModule>
+ where TStartupModule : IAbpModule
+ {
+ /// <summary>
+ /// SetAbpApplicationCreationOptions
+ /// </summary>
+ /// <param name="options">AbpApplicationCreationOptions</param>
+ protected override void SetAbpApplicationCreationOptions(AbpApplicationCreationOptions options)
+ {
+ options.UseAutofac();
+ }
+
+ /// <summary>
+ /// WithUnitOfWorkAsync
+ /// </summary>
+ /// <param name="func">func</param>
+ /// <returns>Task</returns>
+ protected virtual Task WithUnitOfWorkAsync(Func<Task> func)
+ {
+ return WithUnitOfWorkAsync(new AbpUnitOfWorkOptions(), func);
+ }
+
+ /// <summary>
+ /// WithUnitOfWorkAsync
+ /// </summary>
+ /// <param name="options">AbpUnitOfWorkOptions</param>
+ /// <param name="action">action</param>
+ /// <returns>Task</returns>
+ protected virtual async Task WithUnitOfWorkAsync(AbpUnitOfWorkOptions options, Func<Task> action)
+ {
+ using (var scope = ServiceProvider.CreateScope())
+ {
+ var uowManager = scope.ServiceProvider.GetRequiredService<IUnitOfWorkManager>();
+
+ using (var uow = uowManager.Begin(options))
+ {
+ await action();
+
+ await uow.CompleteAsync();
+ }
+ }
+ }
+
+ /// <summary>
+ /// WithUnitOfWorkAsync
+ /// </summary>
+ /// <typeparam name="TResult">t</typeparam>
+ /// <param name="func">TResult</param>
+ /// <returns>TResult</returns>
+ protected virtual Task<TResult> WithUnitOfWorkAsync<TResult>(Func<Task<TResult>> func)
+ {
+ return WithUnitOfWorkAsync(new AbpUnitOfWorkOptions(), func);
+ }
+
+ /// <summary>
+ /// WithUnitOfWorkAsync
+ /// </summary>
+ /// <typeparam name="TResult">T</typeparam>
+ /// <param name="options">AbpUnitOfWorkOptions</param>
+ /// <param name="func">Func</param>
+ /// <returns>TResult</returns>
+ protected virtual async Task<TResult> WithUnitOfWorkAsync<TResult>(AbpUnitOfWorkOptions options, Func<Task<TResult>> func)
+ {
+ using (var scope = ServiceProvider.CreateScope())
+ {
+ var uowManager = scope.ServiceProvider.GetRequiredService<IUnitOfWorkManager>();
+
+ using (var uow = uowManager.Begin(options))
+ {
+ var result = await func();
+ await uow.CompleteAsync();
+ return result;
+ }
+ }
+ }
+ }
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/test/CMS.Plugin.WareCmsUtilityApi.TestBase/WareCmsUtilityApiTestBaseModule.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/test/CMS.Plugin.WareCmsUtilityApi.TestBase/WareCmsUtilityApiTestBaseModule.cs"
new file mode 100644
index 0000000..be590b8
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/test/CMS.Plugin.WareCmsUtilityApi.TestBase/WareCmsUtilityApiTestBaseModule.cs"
@@ -0,0 +1,63 @@
+using CMS.Plugin.WareCmsUtilityApi.Domain;
+using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp;
+using Volo.Abp.Autofac;
+using Volo.Abp.Data;
+using Volo.Abp.Modularity;
+using Volo.Abp.Threading;
+using Volo.Abp.Uow;
+
+namespace CMS.Plugin.WareCmsUtilityApi.TestBase
+{
+ /// <summary>
+ /// MyProjectName TestBaseModule
+ /// </summary>
+ [DependsOn(
+ typeof(AbpAutofacModule),
+ typeof(AbpTestBaseModule),
+ typeof(CMSPluginDomainModule))]
+ public class WareCmsUtilityApiTestBaseModule : AbpModule
+ {
+ /// <summary>
+ /// PreConfigureServices
+ /// </summary>
+ /// <param name="context">ServiceConfigurationContext</param>
+ public override void PreConfigureServices(ServiceConfigurationContext context)
+ {
+ }
+
+ /// <summary>
+ /// ConfigureServices
+ /// </summary>
+ /// <param name="context">ServiceConfigurationContext</param>
+ public override void ConfigureServices(ServiceConfigurationContext context)
+ {
+ context.Services.AddAlwaysAllowAuthorization();
+ Configure<AbpUnitOfWorkDefaultOptions>(options =>
+ {
+ options.TransactionBehavior = UnitOfWorkTransactionBehavior.Enabled;
+ });
+ }
+
+ /// <summary>
+ /// OnApplicationInitialization
+ /// </summary>
+ /// <param name="context">ApplicationInitializationContext</param>
+ public override void OnApplicationInitialization(ApplicationInitializationContext context)
+ {
+ SeedTestData(context);
+ }
+
+ private static void SeedTestData(ApplicationInitializationContext context)
+ {
+ AsyncHelper.RunSync(async () =>
+ {
+ using (var scope = context.ServiceProvider.CreateScope())
+ {
+ var dataSeeder = scope.ServiceProvider.GetRequiredService<IDataSeeder>();
+ await dataSeeder.SeedAsync();
+ }
+ });
+ }
+ }
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/test/CMS.Plugin.WareCmsUtilityApi.TestBase/WareCmsUtilityApiTestData.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/test/CMS.Plugin.WareCmsUtilityApi.TestBase/WareCmsUtilityApiTestData.cs"
new file mode 100644
index 0000000..aff0c50
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/WareCmsUtilityApi/server/test/CMS.Plugin.WareCmsUtilityApi.TestBase/WareCmsUtilityApiTestData.cs"
@@ -0,0 +1,8 @@
+using Volo.Abp.DependencyInjection;
+
+namespace CMS.Plugin.WareCmsUtilityApi.TestBase
+{
+ public class WareCmsUtilityApiTestData : ISingletonDependency
+ {
+ }
+}
--
Gitblit v1.9.3