Merge branch 'dev' of http://123.60.180.165:4647/ZZYDOP/DOPCore into dev

.gitignore

@@ -1999,3 +1999,12 @@ MicroServices/Business/Bussiness.EntityFrameworkCore.Test/bin/Debug/net6.0/runti
 /MicroServices/Business/Bussiness.ApplicationTest/bin/Debug/net6.0
 /MicroServices/Business/Bussiness.Domain.Test/bin/Debug/net6.0
 /MicroServices/Business/Bussiness.EntityFrameworkCore.Test/bin/Debug/net6.0
+/MicroServices/DigitalManufacturing/DigitalManufacturing.Host/obj
+/MicroServices/DigitalManufacturing/DigitalManufacturing.EntityFrameworkCore/obj
+/MicroServices/DigitalManufacturing/DigitalManufacturing.Domain/obj
+/MicroServices/DigitalManufacturing/DigitalManufacturing.Application.Contracts/obj
+/MicroServices/DigitalManufacturing/DigitalManufacturing.Application/obj
+/MicroServices/DigitalManufacturing/DigitalManufacturing.Core/obj
+/MicroServices/DigitalManufacturing/.vs/DigitalManufacturing
+/MicroServices/DigitalManufacturing/.vs/ProjectEvaluation/digitalmanufacturing.metadata.v5.2
+/MicroServices/DigitalManufacturing/.vs/ProjectEvaluation/digitalmanufacturing.projects.v5.2

MicroServices/Business/Buissness.UnitTest/Buissness.TestBase.csproj

@@ -11,13 +11,13 @@
     <PackageReference Include="Mongo2Go" Version="3.1.3" />
     <PackageReference Include="NSubstitute" Version="4.2.2" />
     <PackageReference Include="Shouldly" Version="4.1.0" />
-    <PackageReference Include="Volo.Abp.Authorization" Version="4.4.0" />
-    <PackageReference Include="Volo.Abp.Autofac" Version="4.4.0" />
+    <PackageReference Include="Volo.Abp.Authorization" Version="7.1.0" />
+    <PackageReference Include="Volo.Abp.Autofac" Version="7.1.0" />
     <PackageReference Include="Volo.Abp.BackgroundJobs.Domain" Version="4.4.0" />
     <PackageReference Include="Volo.Abp.Identity.Domain" Version="4.4.0" />
     <PackageReference Include="Volo.Abp.IdentityServer.Domain" Version="4.4.0" />
-    <PackageReference Include="Volo.Abp.Json" Version="7.1.0-rc.2" />
-    <PackageReference Include="Volo.Abp.TestBase" Version="7.1.0-rc.2" />
+    <PackageReference Include="Volo.Abp.Json" Version="7.1.0" />
+    <PackageReference Include="Volo.Abp.TestBase" Version="7.1.0" />
     <PackageReference Include="xunit.extensibility.core" Version="2.4.2" />
   </ItemGroup>
 

MicroServices/Business/Buissness.UnitTest/CoreTestDataSeedContributor.cs

@@ -70,6 +70,7 @@ namespace Buissness.TestBase
             _mysql_ic_item = mysql_ic_item;
             _mysql_ic_bom = mysql_ic_bom;
             _mysql_ic_bom_child = mysql_ic_bom_child;
+            _mysql_mes_technique= mysql_mes_technique;
             _mysql_crm_seorder = mysql_crm_seorder;
             _mysql_crm_seorderentry = mysql_crm_seorderentry;
             _mysql_ic_item_stock = mysql_ic_item_stock;
@@ -79,6 +80,8 @@ namespace Buissness.TestBase
             _mysql_mes_mooccupy = mysql_mes_mooccupy;
             _mysql_mes_morder = mysql_mes_morder;
             _mysql_mes_moentry = mysql_mes_moentry;
+            _mysql_mes_process= mysql_mes_process;
+            _mysql_mes_tech_process= mysql_mes_tech_process;
             _mysql_srm_po_main = mysql_srm_po_main;
             _mysql_srm_po_list = mysql_srm_po_list;
             _mysql_srm_po_occupy = mysql_srm_po_occupy;

MicroServices/Business/Business.Application/ResourceExamineManagement/PretreatmentAppService.cs

@@ -189,13 +189,8 @@ namespace Business.ResourceExamineManagement
             //除顶级外，其他层级关系全带出来。生成平铺
             foreach (var item in returnlist)
             {
-                //最顶级、虚拟件、已计算过的群组
-                if (item.level == 1 || item.erp_cls == 4 || childidList.Contains(item.bom_child_id.GetValueOrDefault()))
-                {
-                    continue;
-                }
-                //没有替代关系
-                if (item.haveicsubs != 1)
+                //最顶级、虚拟件、已计算过的群组、没有替代关系
+                if (item.level == 1 || item.erp_cls == 4 || childidList.Contains(item.bom_child_id.GetValueOrDefault()) || item.haveicsubs != 1)
                 {
                     continue;
                 }

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

@@ -660,14 +660,26 @@ namespace Business.ResourceExamineManagement
         public List<mo_mes_technique> GetMesTechniques(List<mo_ic_bom> ic_Boms)
         {
             List<mo_mes_technique> techniques = new List<mo_mes_technique>();
-            foreach (var item in ic_Boms)
+            //foreach (var item in ic_Boms)
+            //{
+            //    mo_mes_technique entity = _mes_technique.Find(p => p.bom == item.bom_number && p.bomver == item.version && p.tenant_id == param.tenantId && p.factory_id == param.factoryId && !p.IsDeleted).Result.FirstOrDefault();
+            //    if (entity != null)
+            //    {
+            //        techniques.Add(entity);
+            //    }
+            //}
+            var builder = Builders<mo_mes_technique>.Filter;
+            var filters = new List<FilterDefinition<mo_mes_technique>>();
+            ic_Boms?.ForEach(item =>
             {
-                mo_mes_technique entity = _mes_technique.Find(p => p.bom == item.bom_number && p.bomver == item.version && p.tenant_id == param.tenantId && p.factory_id == param.factoryId && !p.IsDeleted).Result.FirstOrDefault();
-                if (entity != null)
-                {
-                    techniques.Add(entity);
-                }
-            }
+                var filter = builder.Eq(x => x.bom, item.bom_number)
+                & builder.Eq(x => x.bomver, item.version)
+                & builder.Eq(x => x.tenant_id, param.tenantId)
+                & builder.Eq(x => x.factory_id, param.factoryId)
+                & builder.Eq(x => x.IsDeleted, false);
+                filters.Add(filter);
+            });
+            techniques = _mes_technique.Find(builder.Or(filters)).Result;
             return techniques;
         }
 
@@ -1526,7 +1538,7 @@ namespace Business.ResourceExamineManagement
             }
 
             //1.2、获取工艺路径关联工序数据
-            List<mo_mes_tech_process> tech_Processes = _mes_tech_process.GetManyByCondition(p => techs.Select(m => m.mysql_id).ToList().Contains(p.tech_id) && p.tenant_id == param.tenantId && p.factory_id == param.factoryId && !p.IsDeleted).Result;
+            List<mo_mes_tech_process> tech_Processes = _mes_tech_process.GetManyByCondition(p => techs.Select(m => m.mysql_id).Contains(p.tech_id) && p.tenant_id == param.tenantId && p.factory_id == param.factoryId && !p.IsDeleted).Result;
             if (tech_Processes.Count == 0)
             {
                 //throw new NotImplementedException("请先配置工序！");

MicroServices/Business/Business.Core/MongoDBHelper/IMongoDB.cs

@@ -80,5 +80,14 @@ namespace Business.Core.MongoDBHelper
         /// <param name="options"></param>
         /// <returns></returns>
         Task<BulkWriteResult<T>> BulkWrite(List<WriteModel<T>> updates, BulkWriteOptions options = null);
+
+        /// <summary>
+        /// 根据条件获取结果列表
+        /// </summary>
+        /// <param name="filter">条件FilterDefinition</param>
+        /// <param name="sorter">排序规则定义</param>
+        /// <param name="projecter">查询字段定义</param>
+        /// <returns>结果列表</returns>
+       Task<List<T>> Find(FilterDefinition<T> filter, ProjectionDefinition<T, T> projecter = null, SortDefinition<T> sorter = null);
     }
 }

MicroServices/Business/Business.Core/MongoDBHelper/MongoDBTools.cs

@@ -182,6 +182,15 @@ namespace Business.Core.MongoDBHelper
             return mongoCollection.BulkWriteAsync(updates,options);
         }
 
+        /// <summary>
+        /// 根据条件获取结果列表
+        /// </summary>
+        /// <param name="filter">条件FilterDefinition</param>
+        /// <returns>结果列表</returns>
+        public Task<List<T>> Find(FilterDefinition<T> filter, ProjectionDefinition<T, T> projecter = null, SortDefinition<T> sorter = null)
+        {
+            return mongoCollection.Find(filter).Project(projecter).Sort(sorter).ToListAsync();
+        }
         /// <summary>
         /// 排序扩展方法
         /// </summary>

MicroServices/Business/Business.EntityFrameworkCore/EntityFrameworkCore/MyConnectionStringResolver.cs

@@ -20,7 +20,11 @@ namespace Business.EntityFrameworkCore
 
         public override string GetNameOrConnectionString(ConnectionStringResolveArgs args)
         {
-            if (args["DbContextConcreteType"] as Type == typeof(BusinessExtDbContext))
+
+            if (args["DbContextConcreteType"] as Type == typeof(BusinessDbContext))
+            {
+                return _appConfiguration.GetConnectionString("Default");
+            }else if (args["DbContextConcreteType"] as Type == typeof(BusinessExtDbContext))
             {
                 return _appConfiguration.GetConnectionString("DOPExt");
             }else if (args["DbContextConcreteType"] as Type == typeof(BusinessBangDbContext))

MicroServices/Business/Bussiness.EntityFrameworkCore.Test/Bussiness.EntityFrameworkCore.Test.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
@@ -10,6 +10,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
+    <PackageReference Include="Volo.Abp.EntityFrameworkCore.Sqlite" 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>

MicroServices/Business/Bussiness.EntityFrameworkCore.Test/EntityFrameworkCore/CoreEntityFrameworkCoreTestModule.cs

@@ -9,6 +9,7 @@ using Volo.Abp;
 using Volo.Abp.EntityFrameworkCore;
 using Volo.Abp.EntityFrameworkCore.Sqlite;
 using Volo.Abp.Modularity;
+using Volo.Abp.Uow;
 
 namespace Bussiness.EntityFrameworkCore.Test
 {
@@ -22,6 +23,7 @@ namespace Bussiness.EntityFrameworkCore.Test
 
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
+            context.Services.AddAlwaysDisableUnitOfWorkTransaction();
             ConfigureInMemorySqlite(context.Services);
         }
 
@@ -57,6 +59,20 @@ namespace Bussiness.EntityFrameworkCore.Test
                 context.GetService<IRelationalDatabaseCreator>().CreateTables();
             }
 
+            var optionsBang = new DbContextOptionsBuilder<BusinessBangDbContext>().UseSqlite(connection).Options;
+
+            using (var context = new BusinessBangDbContext(optionsBang))
+            {
+                context.GetService<IRelationalDatabaseCreator>().CreateTables();
+            }
+
+            var optionsExt = new DbContextOptionsBuilder<BusinessExtDbContext>().UseSqlite(connection).Options;
+
+            using (var context = new BusinessExtDbContext(optionsExt))
+            {
+                context.GetService<IRelationalDatabaseCreator>().CreateTables();
+            }
+
             return connection;
         }
     }

MicroServices/DigitalManufacturing/DigitalManufacturing.EntityFrameworkCore/DigitalManufacturing.EntityFrameworkCore.csproj

@@ -11,6 +11,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Volo.Abp.EntityFrameworkCore.MySQL" Version="6.0.0" />
+    <PackageReference Include="Volo.Abp.EntityFrameworkCore.SqlServer" Version="6.0.2" />
 	  <PackageReference Include="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="6.0.0" />
   </ItemGroup>
 

MicroServices/DigitalManufacturing/DigitalManufacturing.EntityFrameworkCore/EntityFrameworkCore/DigitalManufacturingEntityFrameworkCoreModule.cs

@@ -16,7 +16,7 @@ namespace DigitalManufacturing.EntityFrameworkCore
         {
             Configure<AbpDbContextOptions>(options =>
             {
-                options.UseMySQL();
+                options.UseSqlServer();
             });
 
             context.Services.AddAbpDbContext<DigitalManufacturingDbContext>(options =>

MicroServices/DigitalManufacturing/DigitalManufacturing.Host/EntityFrameworkCore/DigitalManufacturingMigrationDbContextFactory.cs

@@ -15,8 +15,9 @@ namespace DigitalManufacturing.EntityFrameworkCore
         {
             var configuration = BuildConfiguration();
 
-            var builder = new DbContextOptionsBuilder<DigitalManufacturingMigrationDbContext>()
-                .UseMySql(configuration.GetConnectionString("Default"),MySqlServerVersion.LatestSupportedServerVersion);
+            //var builder = new DbContextOptionsBuilder<DigitalManufacturingMigrationDbContext>()
+            //    .UseMySql(configuration.GetConnectionString("Default"),MySqlServerVersion.LatestSupportedServerVersion);
+            var builder = new DbContextOptionsBuilder<DigitalManufacturingMigrationDbContext>().UseSqlServer(configuration.GetConnectionString("Default"));
 
             return new DigitalManufacturingMigrationDbContext(builder.Options);
         }

MicroServices/DigitalManufacturing/DigitalManufacturing.Host/appsettings.json

@@ -3,8 +3,10 @@
     "CorsOrigins": "http://localhost:9527"
   },
   "ConnectionStrings": {
-    "Default": "Server=123.60.180.165;Database=dopbiz;Uid=root; Pwd=5heng=uN;Allow User Variables=True;sslMode=None;",
-    "DOPLog": "Server=123.60.180.165;Database=doplog;Uid=root; Pwd=5heng=uN;Allow User Variables=true"
+    //"Default": "Server=123.60.180.165;Database=dopbiz;Uid=root; Pwd=5heng=uN;Allow User Variables=True;sslMode=None;",
+    //"DOPLog": "Server=123.60.180.165;Database=doplog;Uid=root; Pwd=5heng=uN;Allow User Variables=true",
+    "Default": "Server=123.60.180.165;Database=dopbiz;uid=sa;pwd=5heng)uN;Trusted_Connection=false;TrustServerCertificate=True",
+    "DOPLog": "Server=123.60.180.165;Database=doplog;uid=sa;pwd=5heng)uN;Trusted_Connection=false;TrustServerCertificate=True"
   },
   "Redis": {
     "Configuration": "192.168.1.191"