Merge branch 'master' of http://123.60.180.165:4647/ZZYDOP/DOPCore

# Conflicts:
#	MicroServices/Business/Business.Application/ResourceExamineManagement/ResourceExamineAppService.cs

.gitignore

@@ -251,3 +251,363 @@ MicroServices/Business/Bussiness.Model/obj/Debug/net6.0/Bussiness.Model.csproj.B
 /MicroServices/Business/Bussiness.MongoModel/bin/Debug/net6.0/Business.Core.pdb
 /MicroServices/Business/Bussiness.MongoModel/bin/Debug/net6.0/Bussiness.MongoModel.dll
 /MicroServices/Business/Bussiness.MongoModel/bin/Debug/net6.0/Bussiness.MongoModel.pdb
+MicroServices/Business/Business.Domain/Properties/launchSettings.json
+MicroServices/Business/Business.EntityFrameworkCore/Properties/launchSettings.json
+MicroServices/Business/Business.HttpApi.Client/Properties/launchSettings.json
+MicroServices/Business/Bussiness.Model/obj/Business.HttpApi.csproj.nuget.dgspec.json
+MicroServices/Business/Bussiness.Model/obj/Business.HttpApi.csproj.nuget.g.props
+MicroServices/Business/Bussiness.Model/obj/Business.HttpApi.csproj.nuget.g.targets
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Autofac.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Autofac.Extensions.DependencyInjection.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Autofac.Extras.DynamicProxy.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/AutoMapper.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/AWSSDK.Core.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/AWSSDK.SecurityToken.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/BaseService.Application.Contracts.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/BaseService.HttpApi.Client.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Business.Application.Contracts.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Business.Application.Contracts.pdb
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Business.Application.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Business.Application.pdb
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Business.Core.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Business.Core.pdb
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Business.Domain.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Business.Domain.pdb
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Business.Tests.deps.json
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Business.Tests.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Business.Tests.runtimeconfig.json
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Bussiness.Model.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Bussiness.Model.pdb
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Bussiness.MongoModel.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Bussiness.MongoModel.pdb
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Castle.Core.AsyncInterceptor.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Castle.Core.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/CoverletSourceRootsMapping
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/DiffEngine.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/DnsClient.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Effort.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/EmptyFiles.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/EntityFramework.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/EntityFramework.SqlServer.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/FileStorage.Application.Contracts.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Hangfire.AspNetCore.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Hangfire.Core.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/IdentityModel.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/JetBrains.Annotations.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Magicodes.IE.Core.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Magicodes.IE.Html.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Magicodes.IE.Pdf.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Microsoft.AspNetCore.Authorization.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Microsoft.AspNetCore.Metadata.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Microsoft.AspNetCore.Razor.Language.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Microsoft.Bcl.AsyncInterfaces.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Microsoft.CodeAnalysis.CSharp.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Microsoft.CodeAnalysis.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Microsoft.EntityFrameworkCore.Abstractions.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Microsoft.EntityFrameworkCore.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Microsoft.EntityFrameworkCore.Relational.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Microsoft.Extensions.Caching.Memory.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Microsoft.Extensions.Configuration.Abstractions.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Microsoft.Extensions.Configuration.Binder.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Microsoft.Extensions.Configuration.CommandLine.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Microsoft.Extensions.Configuration.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Microsoft.Extensions.Configuration.EnvironmentVariables.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Microsoft.Extensions.Configuration.FileExtensions.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Microsoft.Extensions.Configuration.Json.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Microsoft.Extensions.Configuration.UserSecrets.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Microsoft.Extensions.DependencyInjection.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Microsoft.Extensions.DependencyModel.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Microsoft.Extensions.FileProviders.Abstractions.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Microsoft.Extensions.FileProviders.Embedded.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Microsoft.Extensions.FileProviders.Physical.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Microsoft.Extensions.FileSystemGlobbing.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Microsoft.Extensions.Hosting.Abstractions.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Microsoft.Extensions.Localization.Abstractions.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Microsoft.Extensions.Localization.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Microsoft.Extensions.Logging.Abstractions.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Microsoft.Extensions.Logging.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Microsoft.Extensions.Options.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Microsoft.Extensions.Primitives.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Microsoft.TestPlatform.CommunicationUtilities.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Microsoft.TestPlatform.CoreUtilities.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Microsoft.TestPlatform.CrossPlatEngine.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Microsoft.TestPlatform.PlatformAbstractions.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Microsoft.TestPlatform.Utilities.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Microsoft.VisualStudio.CodeCoverage.Shim.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Microsoft.VisualStudio.TestPlatform.Common.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Microsoft.VisualStudio.TestPlatform.ObjectModel.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Microsoft.Win32.SystemEvents.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/MongoDB.Bson.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/MongoDB.Driver.Core.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/MongoDB.Driver.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/MongoDB.Libmongocrypt.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Newtonsoft.Json.Bson.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Newtonsoft.Json.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Nito.AsyncEx.Context.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Nito.AsyncEx.Coordination.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Nito.AsyncEx.Tasks.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Nito.Collections.Deque.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Nito.Disposables.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/NMemory.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/NuGet.Frameworks.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/NUglify.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/RazorEngine.NetCore.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/SharpCompress.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Shouldly.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/SixLabors.ImageSharp.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Snappier.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/System.CodeDom.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/System.Collections.Immutable.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/System.Configuration.ConfigurationManager.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/System.Data.SqlClient.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/System.Drawing.Common.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/System.Linq.Dynamic.Core.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/System.Management.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/System.Security.Cryptography.ProtectedData.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/System.Security.Permissions.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/System.Text.Encodings.Web.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/System.Text.Json.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/System.Windows.Extensions.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/testhost.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/testhost.exe
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/TimeZoneConverter.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Volo.Abp.Auditing.Contracts.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Volo.Abp.Auditing.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Volo.Abp.AuditLogging.Domain.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Volo.Abp.AuditLogging.Domain.Shared.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Volo.Abp.Authorization.Abstractions.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Volo.Abp.Authorization.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Volo.Abp.Autofac.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Volo.Abp.AutoMapper.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Volo.Abp.BackgroundJobs.Abstractions.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Volo.Abp.BackgroundJobs.HangFire.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Volo.Abp.BackgroundWorkers.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Volo.Abp.Caching.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Volo.Abp.Castle.Core.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Volo.Abp.Core.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Volo.Abp.Data.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Volo.Abp.Ddd.Application.Contracts.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Volo.Abp.Ddd.Application.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Volo.Abp.Ddd.Domain.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Volo.Abp.DistributedLocking.Abstractions.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Volo.Abp.EntityFrameworkCore.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Volo.Abp.EventBus.Abstractions.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Volo.Abp.EventBus.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Volo.Abp.ExceptionHandling.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Volo.Abp.Features.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Volo.Abp.GlobalFeatures.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Volo.Abp.Guids.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Volo.Abp.HangFire.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Volo.Abp.Http.Abstractions.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Volo.Abp.Http.Client.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Volo.Abp.Http.Client.IdentityModel.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Volo.Abp.Http.Client.IdentityModel.Web.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Volo.Abp.Http.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Volo.Abp.Identity.Application.Contracts.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Volo.Abp.Identity.Domain.Shared.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Volo.Abp.Identity.HttpApi.Client.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Volo.Abp.IdentityModel.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Volo.Abp.Json.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Volo.Abp.Localization.Abstractions.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Volo.Abp.Localization.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Volo.Abp.Minify.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Volo.Abp.MultiTenancy.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Volo.Abp.ObjectExtending.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Volo.Abp.ObjectMapping.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Volo.Abp.PermissionManagement.Application.Contracts.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Volo.Abp.PermissionManagement.Domain.Shared.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Volo.Abp.RemoteServices.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Volo.Abp.Security.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Volo.Abp.Serialization.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Volo.Abp.SettingManagement.Domain.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Volo.Abp.SettingManagement.Domain.Shared.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Volo.Abp.Settings.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Volo.Abp.Specifications.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Volo.Abp.TestBase.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Volo.Abp.Threading.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Volo.Abp.Timing.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Volo.Abp.Uow.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Volo.Abp.Users.Abstractions.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Volo.Abp.Users.Domain.Shared.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Volo.Abp.Validation.Abstractions.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Volo.Abp.Validation.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/Volo.Abp.VirtualFileSystem.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/WkHtmlToPdfDotNet.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/XCZ.FlowManagement.Application.Contracts.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/XCZ.FlowManagement.Application.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/XCZ.FlowManagement.Core.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/XCZ.FlowManagement.Domain.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/XCZ.FormManagement.Application.Contracts.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/XCZ.FormManagement.Application.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/XCZ.FormManagement.Core.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/XCZ.FormManagement.Domain.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/xunit.abstractions.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/xunit.assert.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/xunit.core.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/xunit.execution.dotnet.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/xunit.runner.reporters.netcoreapp10.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/xunit.runner.utility.netcoreapp10.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/xunit.runner.visualstudio.dotnetcore.testadapter.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/ZstdSharp.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/ca/Hangfire.Core.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/cs/Microsoft.TestPlatform.CommunicationUtilities.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/cs/Microsoft.TestPlatform.CoreUtilities.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/cs/Microsoft.TestPlatform.CrossPlatEngine.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/cs/Microsoft.VisualStudio.TestPlatform.Common.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/cs/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/de/Hangfire.Core.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/de/Microsoft.TestPlatform.CommunicationUtilities.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/de/Microsoft.TestPlatform.CoreUtilities.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/de/Microsoft.TestPlatform.CrossPlatEngine.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/de/Microsoft.VisualStudio.TestPlatform.Common.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/de/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/EmptyFiles/archive/empty.7z
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/EmptyFiles/archive/empty.bz2
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/EmptyFiles/archive/empty.gz
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/EmptyFiles/archive/empty.tar
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/EmptyFiles/archive/empty.xz
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/EmptyFiles/archive/empty.zip
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/EmptyFiles/document/empty.docx
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/EmptyFiles/document/empty.odt
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/EmptyFiles/document/empty.pdf
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/EmptyFiles/document/empty.rtf
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/EmptyFiles/image/empty.avif
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/EmptyFiles/image/empty.bmp
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/EmptyFiles/image/empty.dds
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/EmptyFiles/image/empty.dib
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/EmptyFiles/image/empty.emf
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/EmptyFiles/image/empty.exif
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/EmptyFiles/image/empty.gif
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/EmptyFiles/image/empty.heic
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/EmptyFiles/image/empty.heif
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/EmptyFiles/image/empty.ico
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/EmptyFiles/image/empty.j2c
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/EmptyFiles/image/empty.jfif
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/EmptyFiles/image/empty.jp2
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/EmptyFiles/image/empty.jpc
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/EmptyFiles/image/empty.jpe
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/EmptyFiles/image/empty.jpg
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/EmptyFiles/image/empty.jxr
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/EmptyFiles/image/empty.pbm
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/EmptyFiles/image/empty.pcx
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/EmptyFiles/image/empty.pgm
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/EmptyFiles/image/empty.png
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/EmptyFiles/image/empty.ppm
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/EmptyFiles/image/empty.rle
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/EmptyFiles/image/empty.tga
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/EmptyFiles/image/empty.tif
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/EmptyFiles/image/empty.wdp
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/EmptyFiles/image/empty.webp
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/EmptyFiles/image/empty.wmp
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/EmptyFiles/sheet/empty.ods
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/EmptyFiles/sheet/empty.xlsx
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/EmptyFiles/slide/empty.odp
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/EmptyFiles/slide/empty.pptx
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/es/Hangfire.Core.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/es/Microsoft.TestPlatform.CommunicationUtilities.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/es/Microsoft.TestPlatform.CoreUtilities.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/es/Microsoft.TestPlatform.CrossPlatEngine.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/es/Microsoft.VisualStudio.TestPlatform.Common.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/es/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/fa/Hangfire.Core.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/fr/Hangfire.Core.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/fr/Microsoft.TestPlatform.CommunicationUtilities.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/fr/Microsoft.TestPlatform.CoreUtilities.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/fr/Microsoft.TestPlatform.CrossPlatEngine.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/fr/Microsoft.VisualStudio.TestPlatform.Common.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/fr/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/it/Microsoft.TestPlatform.CommunicationUtilities.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/it/Microsoft.TestPlatform.CoreUtilities.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/it/Microsoft.TestPlatform.CrossPlatEngine.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/it/Microsoft.VisualStudio.TestPlatform.Common.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/it/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/ja/Microsoft.TestPlatform.CommunicationUtilities.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/ja/Microsoft.TestPlatform.CoreUtilities.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/ja/Microsoft.TestPlatform.CrossPlatEngine.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/ja/Microsoft.VisualStudio.TestPlatform.Common.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/ja/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/ko/Microsoft.TestPlatform.CommunicationUtilities.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/ko/Microsoft.TestPlatform.CoreUtilities.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/ko/Microsoft.TestPlatform.CrossPlatEngine.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/ko/Microsoft.VisualStudio.TestPlatform.Common.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/ko/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/nb/Hangfire.Core.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/nl/Hangfire.Core.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/pl/Microsoft.TestPlatform.CommunicationUtilities.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/pl/Microsoft.TestPlatform.CoreUtilities.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/pl/Microsoft.TestPlatform.CrossPlatEngine.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/pl/Microsoft.VisualStudio.TestPlatform.Common.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/pl/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/pt/Hangfire.Core.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/pt-BR/Hangfire.Core.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/pt-BR/Microsoft.TestPlatform.CommunicationUtilities.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/pt-BR/Microsoft.TestPlatform.CoreUtilities.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/pt-BR/Microsoft.TestPlatform.CrossPlatEngine.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/pt-BR/Microsoft.VisualStudio.TestPlatform.Common.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/pt-BR/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/pt-PT/Hangfire.Core.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/ru/Microsoft.TestPlatform.CommunicationUtilities.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/ru/Microsoft.TestPlatform.CoreUtilities.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/ru/Microsoft.TestPlatform.CrossPlatEngine.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/ru/Microsoft.VisualStudio.TestPlatform.Common.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/ru/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/runtimes/browser/lib/net6.0/System.Text.Encodings.Web.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/runtimes/linux/native/libmongocrypt.so
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/runtimes/linux-x64/native/libwkhtmltox.so
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/runtimes/linux-x86/native/libwkhtmltox.so
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/runtimes/osx/native/libmongocrypt.dylib
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/runtimes/osx-x64/native/libwkhtmltox.dylib
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/runtimes/unix/lib/netcoreapp2.1/System.Data.SqlClient.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/runtimes/unix/lib/netcoreapp3.0/System.Drawing.Common.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/runtimes/win/lib/netcoreapp2.0/System.Management.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/runtimes/win/lib/netcoreapp2.1/System.Data.SqlClient.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/runtimes/win/lib/netcoreapp3.0/Microsoft.Win32.SystemEvents.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/runtimes/win/lib/netcoreapp3.0/System.Drawing.Common.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/runtimes/win/lib/netcoreapp3.0/System.Windows.Extensions.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/runtimes/win/lib/netstandard2.0/System.Security.Cryptography.ProtectedData.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/runtimes/win/native/mongocrypt.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/runtimes/win-arm64/native/sni.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/runtimes/win-x64/native/sni.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/runtimes/win-x64/native/wkhtmltox.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/runtimes/win-x86/native/sni.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/runtimes/win-x86/native/wkhtmltox.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/tr/Microsoft.TestPlatform.CommunicationUtilities.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/tr/Microsoft.TestPlatform.CoreUtilities.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/tr/Microsoft.TestPlatform.CrossPlatEngine.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/tr/Microsoft.VisualStudio.TestPlatform.Common.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/tr/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/tr-TR/Hangfire.Core.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/zh/Hangfire.Core.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/zh-Hans/Magicodes.IE.Core.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/zh-Hans/Microsoft.TestPlatform.CommunicationUtilities.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/zh-Hans/Microsoft.TestPlatform.CoreUtilities.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/zh-Hans/Microsoft.TestPlatform.CrossPlatEngine.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/zh-Hans/Microsoft.VisualStudio.TestPlatform.Common.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/zh-Hans/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/zh-Hant/Microsoft.TestPlatform.CommunicationUtilities.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/zh-Hant/Microsoft.TestPlatform.CoreUtilities.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/zh-Hant/Microsoft.TestPlatform.CrossPlatEngine.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/zh-Hant/Microsoft.VisualStudio.TestPlatform.Common.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/zh-Hant/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll
+MicroServices/Business/Business.Tests/bin/Debug/net6.0/zh-TW/Hangfire.Core.resources.dll
+MicroServices/Business/Business.Tests/obj/Business.Tests.csproj.nuget.dgspec.json
+MicroServices/Business/Business.Tests/obj/Business.Tests.csproj.nuget.g.props
+MicroServices/Business/Business.Tests/obj/Business.Tests.csproj.nuget.g.targets
+MicroServices/Business/Business.Tests/obj/project.assets.json
+MicroServices/Business/Business.Tests/obj/project.nuget.cache
+MicroServices/Business/Business.Tests/obj/Debug/net6.0/.NETCoreApp,Version=v6.0.AssemblyAttributes.cs
+MicroServices/Business/Business.Tests/obj/Debug/net6.0/Business.Tests.AssemblyInfo.cs
+MicroServices/Business/Business.Tests/obj/Debug/net6.0/Business.Tests.AssemblyInfoInputs.cache
+MicroServices/Business/Business.Tests/obj/Debug/net6.0/Business.Tests.assets.cache
+MicroServices/Business/Business.Tests/obj/Debug/net6.0/Business.Tests.csproj.AssemblyReference.cache
+MicroServices/Business/Business.Tests/obj/Debug/net6.0/Business.Tests.csproj.CopyComplete
+MicroServices/Business/Business.Tests/obj/Debug/net6.0/Business.Tests.csproj.CoreCompileInputs.cache
+MicroServices/Business/Business.Tests/obj/Debug/net6.0/Business.Tests.csproj.FileListAbsolute.txt
+MicroServices/Business/Business.Tests/obj/Debug/net6.0/Business.Tests.dll
+MicroServices/Business/Business.Tests/obj/Debug/net6.0/Business.Tests.GeneratedMSBuildEditorConfig.editorconfig
+MicroServices/Business/Business.Tests/obj/Debug/net6.0/Business.Tests.genruntimeconfig.cache
+MicroServices/Business/Business.Tests/obj/Debug/net6.0/Business.Tests.GlobalUsings.g.cs
+MicroServices/Business/Business.Tests/obj/Debug/net6.0/ref/Business.Tests.dll
+MicroServices/Business/Business.Tests/obj/Debug/net6.0/refint/Business.Tests.dll

MicroServices/Business/Business.Application/ResourceExamineManagement/MorderAppService.cs

@@ -234,7 +234,8 @@ namespace Business.ResourceExamineManagement
                 //已占用数据
                 var Sumqty = mooccupies.Count > 0 ? mooccupies.Sum(x => x.moo_qty) : 0.00m;
                 //判断此工单剩余可占用数量
-                if (item.morder_production_number - item.inventory_number - Sumqty > 0)
+                var Sum = item.morder_production_number.GetValueOrDefault() - item.inventory_number.GetValueOrDefault() - Sumqty.GetValueOrDefault();
+                if (Sum > 0)
                 {
                     #region 注释
                     //if (Sumqty > 0 || item.inventory_number > 0)
@@ -266,10 +267,9 @@ namespace Business.ResourceExamineManagement
                     //        {
                     //            bom_number = item.bom_number,
                     //            version = version,
-                    //            packages = (int)Quantity.GetValueOrDefault(),
+                    //            packages = (int)Quantity,
                     //            tenantId = item.tenant_id,
                     //            factoryId = item.factory_id.GetValueOrDefault()
-
                     //        };
                     //        var EndProductiveDate = _productExamineAppService.ProductiveExamine(EndprodExamine);
                     //        var EndDay = ProductiveDate.Result / (60 * 10);
@@ -279,11 +279,10 @@ namespace Business.ResourceExamineManagement
                     //}
 
                     #endregion
-                    var Sum = item.morder_production_number - item.inventory_number - Sumqty;
                     //工单可占用数量-需求数量小于0时 占用工单全部可占用数量
                     if (Sum - Quantity <= 0)
                     {
-                        QuantityNumber = Sum.GetValueOrDefault();
+                        QuantityNumber = Sum;
                     }
                     else
                     {
@@ -297,7 +296,7 @@ namespace Business.ResourceExamineManagement
                     {
                         break;
                     }
-                    Quantity = Quantity - Sum.GetValueOrDefault();
+                    Quantity = Quantity - Sum;
                 }
 
             }
@@ -404,7 +403,7 @@ namespace Business.ResourceExamineManagement
             mes_Mooccupy.mysql_id = snowFlake.NextId();
             mes_Mooccupy.bang_id = bang_id;
             mes_Mooccupy.moo_id_type = MorderEnum.Zyjc_Type;
-            mes_Mooccupy.moo_id_billid = seorderentry.seorder_id;//销售订单ID
+            mes_Mooccupy.moo_id_billid = seorderentry.Id;//销售子表ID
             mes_Mooccupy.fbill_no = seorderentry.bill_no;//销售订单号
             mes_Mooccupy.fentry_id = seorderentry.entry_seq.Value;//销售订单行
             mes_Mooccupy.fitem_name = ic_item.name;//物料名称

MicroServices/Business/Business.Application/ResourceExamineManagement/ResourceExamineAppService.cs

@@ -174,7 +174,7 @@ namespace Business.ResourceExamineManagement
         /// </summary>
         private readonly MorderAppService _morderAppService;
 
-        
+
         /// <summary>
         /// 预处理
         /// </summary>
@@ -305,7 +305,7 @@ namespace Business.ResourceExamineManagement
             param.sorderId = input.sorderId;
             param.tenantId = input.tenantId;
             param.factoryId = input.factoryId;
-            
+
 
             //资源检查结果
             PschedDto rtn = new PschedDto();
@@ -327,6 +327,10 @@ namespace Business.ResourceExamineManagement
             //获取订单行数据
             List<crm_seorderentry> sentrys = await _mysql_crm_seorderentry.GetListAsync(p => p.tenant_id == input.tenantId && p.factory_id == input.factoryId && p.seorder_id == input.sorderId && !p.IsDeleted);
 
+            //删除同步Mysql后旧数据
+            await DeleteMySqlOldData(sentrys);
+
+
             //数据库快照-同步mysql库数据到mongoDB中
             await DbSnapShot(input.tenantId, input.factoryId, bangid);
 
@@ -372,7 +376,7 @@ namespace Business.ResourceExamineManagement
 
             _CalcBomViewAppService.param = param;
             _CalcBomViewAppService.planList = planList;
-            _CalcBomViewAppService.leadTimeList= leadTimeList;
+            _CalcBomViewAppService.leadTimeList = leadTimeList;
             _CalcBomViewAppService.supplierList = supplierList;
             foreach (var item in sentrys)
             {
@@ -406,8 +410,6 @@ namespace Business.ResourceExamineManagement
                 dtl.BomChildExamineList = getBomList;
                 //添加订单行开工信息
                 examines.Add(dtl);
-                //生成工单 TODO：0=产品数量
-                //GenerateMorder(o, 0);
             }
             if (_CalcBomViewAppService.mooccupyAllList.Any())
             {
@@ -428,6 +430,7 @@ namespace Business.ResourceExamineManagement
             //清空快照数据
             await ClearSnapShot(bangid);
             return JsonConvert.SerializeObject(rtn);
+
         }
 
         /// <summary>
@@ -460,6 +463,33 @@ namespace Business.ResourceExamineManagement
                 GetIcBomData(curBoms, bomlist, bomchildlist);
             }
         }
+        /// <summary>
+        /// 删除旧订单行数据
+        /// </summary>
+        /// <param name="tenantId"></param>
+        /// <param name="factoryId"></param>
+        /// <param name="soentry_id"></param>
+        /// <returns></returns>
+        public async Task DeleteMySqlOldData(List<crm_seorderentry> soentry_id)
+        {
+            //删除工单相关表数据
+            var mes_moentry = _mysql_mes_moentry.GetListAsync(x => soentry_id.Select(p => p.Id).Contains(x.soentry_id.Value)).Result;
+
+            var mes_morder = _mysql_mes_morder.GetListAsync(x => mes_moentry.Select(p => p.moentry_moid).ToList().Contains(x.Id)).Result;
+            if (mes_moentry.Count > 0)
+            {
+                await _mysql_mes_moentry.DeleteManyAsync(mes_moentry);
+            }
+            if (mes_morder.Count > 0)
+            {
+                await _mysql_mes_morder.DeleteManyAsync(mes_morder);
+            }
+            var mysql_mes_mooccupy = _mysql_mes_mooccupy.GetListAsync(x => soentry_id.Select(p => p.Id).Contains(x.moo_id_billid.Value)).Result;
+            if (mysql_mes_mooccupy.Count > 0)
+            {
+                await _mysql_mes_mooccupy.DeleteManyAsync(mysql_mes_mooccupy);
+            }
+        }
 
         /// <summary>
         /// 数据库快照
@@ -578,10 +608,16 @@ namespace Business.ResourceExamineManagement
             ProjectionDefinitionBuilder<mo_ic_factory_details> project = new ProjectionDefinitionBuilder<mo_ic_factory_details>();
             return _ic_factory_details.Find(p => icItemIds.Contains(p.icitem_id) && p.factory_id == factoryid && p.tenant_id == tenantId && !p.IsDeleted,
                 project.Include(p => p.icitem_id).Include(p => p.production_leadtime).Include(p => p.stock_leadtime).
-                Include(p => p.transportation_leadtime).Include(p => p.order_leadtime).Include(p=>p.minorderqty)).Result.
-                Select(x => new ICItemLeadTimeDto { item_id = x.icitem_id, transportation_leadtime = x.transportation_leadtime, 
-                                                    stock_leadtime = x.stock_leadtime, production_leadtime = x.production_leadtime, 
-                                                    order_leadtime = x.order_leadtime,minorderqty=x.minorderqty }).AsQueryable<ICItemLeadTimeDto>().ToList();
+                Include(p => p.transportation_leadtime).Include(p => p.order_leadtime).Include(p => p.minorderqty)).Result.
+                Select(x => new ICItemLeadTimeDto
+                {
+                    item_id = x.icitem_id,
+                    transportation_leadtime = x.transportation_leadtime,
+                    stock_leadtime = x.stock_leadtime,
+                    production_leadtime = x.production_leadtime,
+                    order_leadtime = x.order_leadtime,
+                    minorderqty = x.minorderqty
+                }).AsQueryable<ICItemLeadTimeDto>().ToList();
         }
 
         //根据物料id获取物料供应商
@@ -870,7 +906,7 @@ namespace Business.ResourceExamineManagement
                 return sRMPR;
                 //throw new NotImplementedException("未找到物料ic_factory_details或ic_item_pur或ic_plan信息！");
             }
-            
+
             srm_Pr.GenerateNewId();
             srm_Pr.pr_billno = getOrderNum("PR");//pr单号
             srm_Pr.pr_mono = "";//关联工单号
@@ -906,7 +942,7 @@ namespace Business.ResourceExamineManagement
             srm_Pr.bang_id = bangId;
             //_srm_pr_main.InsertOne(srm_Pr);
             decimal? totalLeadTime = leadTime.transportation_leadtime + leadTime.stock_leadtime + leadTime.production_leadtime + leadTime.order_leadtime;
-            
+
             sRMPR.srm_Pr_Main = srm_Pr;
             sRMPR.lastStartTmie = deliveryDate.AddDays((double)totalLeadTime * -1);//减去提前期
             return sRMPR;

MicroServices/Business/Business.Tests/Business.Tests.csproj

@@ -0,0 +1,32 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Effort.EF6" Version="2.2.16" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
+    <PackageReference Include="Shouldly" Version="4.1.0" />
+    <PackageReference Include="Volo.Abp.Autofac" Version="7.0.2" />
+    <PackageReference Include="Volo.Abp.TestBase" Version="6.0.2" />
+    <PackageReference Include="xunit" Version="2.4.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="coverlet.collector" Version="3.1.2">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Business.Application\Business.Application.csproj" />
+  </ItemGroup>
+
+</Project>

MicroServices/Business/Business.Tests/BusinessTestBase.cs

@@ -0,0 +1,65 @@
+using Microsoft.Extensions.DependencyInjection;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Volo.Abp;
+using Volo.Abp.Modularity;
+using Volo.Abp.Testing;
+using Volo.Abp.Uow;
+
+namespace Business.Tests
+{
+    /// <summary>
+    /// 测试基类
+    /// </summary>
+    public abstract class BusinessTestBase<TStartupModule> :AbpIntegratedTest<TStartupModule>
+        where TStartupModule:IAbpModule 
+    {
+        protected override void SetAbpApplicationCreationOptions(AbpApplicationCreationOptions options)
+        {
+            options.UseAutofac();
+        }
+
+        protected virtual Task WithUnitOfWorkAsync(Func<Task> func)
+        {
+            return WithUnitOfWorkAsync(new AbpUnitOfWorkOptions(), func);
+        }
+
+        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();
+                }
+            }
+        }
+
+        protected virtual Task<TResult> WithUnitOfWorkAsync<TResult>(Func<Task<TResult>> func)
+        {
+            return WithUnitOfWorkAsync(new AbpUnitOfWorkOptions(), func);
+        }
+
+        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;
+                }
+            }
+        }
+    }
+}

MicroServices/Business/Business.Tests/BusinessTestModule.cs

@@ -0,0 +1,55 @@
+using Autofac.Core;
+using BaseService.HttpApi.Client;
+using Business.Core.MongoDBHelper;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Volo.Abp.Application;
+using Volo.Abp.AutoMapper;
+using Volo.Abp.Http.Client.IdentityModel;
+using Volo.Abp.Identity;
+using Volo.Abp.Modularity;
+using XCZ;
+
+namespace Business.Tests
+{
+    [DependsOn(
+        typeof(BusinessDomainModule),
+        typeof(BusinessApplicationContractsModule),
+        typeof(AbpDddApplicationModule),
+        typeof(AbpHttpClientIdentityModelModule),
+        typeof(AbpIdentityHttpApiClientModule),
+        typeof(BaseServiceHttpApiClientModule),
+        typeof(FormApplicationModule),
+        typeof(FlowApplicationModule),
+        typeof(AbpAutoMapperModule))]
+    public class BusinessTestModule:AbpModule
+    {
+        public override void ConfigureServices(ServiceConfigurationContext context)
+        {
+            //MongoDBHelper依赖注入
+            context.Services.AddScoped(typeof(IMongoDB<>), typeof(MongoDBTools<>));
+
+            var configuration = context.Services.GetConfiguration();
+            //MongoDB依赖注入
+            ConfigureMongoDB(configuration);
+        }
+
+        /// <summary>
+        /// MongoDB依赖注入
+        /// </summary>
+        /// <param name="context"></param>
+        /// <param name="configuration"></param>
+        private void ConfigureMongoDB(IConfiguration configuration)
+        {
+            Configure<Config>(options => {
+                options.connectstring = configuration.GetConnectionString("MongoDB");
+                options.database = configuration.GetConnectionString("DBName");
+            });
+        }
+    }
+}

MicroServices/Business/Business.Tests/ProductExamineTest.cs

@@ -0,0 +1,47 @@
+using Business.ResourceExamineManagement;
+using Business.ResourceExamineManagement.Dto;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Volo.Abp.Domain.Repositories;
+using XCZ.FormManagement;
+
+namespace Business.Tests
+{
+    /// <summary>
+    /// 产能检查单元测试
+    /// </summary>
+    public class ProductExamineTest:BusinessTestBase<BusinessTestModule>
+    {
+        /// <summary>
+        /// 资源检查服务
+        /// </summary>
+        private readonly IResourceExamineAppService _service;
+
+        /// <summary>
+        /// 构造函数
+        /// </summary>
+        public ProductExamineTest(IResourceExamineAppService service)
+        {
+            _service = service;
+        }
+
+        [Fact]
+        public async Task TestAddPoet()
+        {
+            await WithUnitOfWorkAsync(async () =>
+            {
+                SeorderentryDto input = new SeorderentryDto() { 
+                    sorderId = 1,
+                    tenantId = 102,
+                    factoryId = 10201
+                };
+                //Act
+                var a = await _service.ReceiveResult(input);
+                Assert.True(!string.IsNullOrEmpty(a));
+            });
+        }
+    }
+}

MicroServices/Business/Business.Tests/Usings.cs

@@ -0,0 +1 @@
+global using Xunit;

MicroServices/Business/Business.sln

@@ -21,7 +21,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bussiness.Model", "Bussines
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Business.Core", "Business.Core\Business.Core.csproj", "{EFA46C37-CF8B-425D-8DE3-85FE11116980}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bussiness.MongoModel", "Bussiness.MongoModel\Bussiness.MongoModel.csproj", "{604EACA4-3A26-425C-91B3-4516BA5282BB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bussiness.MongoModel", "Bussiness.MongoModel\Bussiness.MongoModel.csproj", "{604EACA4-3A26-425C-91B3-4516BA5282BB}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{4523E5A9-9492-49A2-8A1A-46080749D966}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Business.Tests", "Business.Tests\Business.Tests.csproj", "{5B827CCF-FF18-4A89-A11A-CB6476394280}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -69,10 +73,17 @@ Global
 		{604EACA4-3A26-425C-91B3-4516BA5282BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{604EACA4-3A26-425C-91B3-4516BA5282BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{604EACA4-3A26-425C-91B3-4516BA5282BB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5B827CCF-FF18-4A89-A11A-CB6476394280}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5B827CCF-FF18-4A89-A11A-CB6476394280}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5B827CCF-FF18-4A89-A11A-CB6476394280}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5B827CCF-FF18-4A89-A11A-CB6476394280}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{5B827CCF-FF18-4A89-A11A-CB6476394280} = {4523E5A9-9492-49A2-8A1A-46080749D966}
+	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {2E43F5D5-31CD-4424-A538-4C716E71D9AF}
 	EndGlobalSection