Merge branch 'master' of http://dev.ccwin-in.com:3000/zhibinlv/QRAPI

API/TaskManager.EntityFramework/IRepository/IRepository.cs

@@ -8,6 +8,7 @@ using System.Threading.Tasks;
 using TaskManager.Entity;
 using TaskManager.EntityFramework.Repository;
 using Wood.Util.Filters;
+using Z.BulkOperations;
 
 namespace TaskManager.EntityFramework
 {
@@ -21,6 +22,14 @@ namespace TaskManager.EntityFramework
         Task UpdateAsync(TEntity entity);
         Task DeleteAsync(long id);
 
+        /// <summary>
+        /// 批量合拼
+        /// </summary>
+        /// <param name="entities"></param>
+        /// <returns></returns>
+        Task BlukMergeAsync(List<TEntity> entities, Action<BulkOperation<TEntity>> action);
+
+        Task BlukInsertAsync(List<TEntity> entities, Action<BulkOperation<TEntity>> action);
         Task<PagedResult<TEntity>> GetPagedAsync(PagingParams pagingParams);
 
 

API/TaskManager.EntityFramework/Repository/Repository.cs

@@ -12,6 +12,7 @@ using TaskManager.Entity;
 using TaskManager.EntityFramework;
 using Wood.Util;
 using Wood.Util.Filters;
+using Z.BulkOperations;
 
 namespace TaskManager.EntityFramework.Repository
 {
@@ -72,6 +73,20 @@ namespace TaskManager.EntityFramework.Repository
             }
         }
 
+        public async Task BlukMergeAsync(List<TEntity> entities,Action<BulkOperation<TEntity>> action)
+        {
+            _context.BulkMerge(entities, action);
+        }
+
+
+        public async Task BlukInsertAsync(List<TEntity> entities, Action<BulkOperation<TEntity>> action)
+        {
+            _context.BulkInsert(entities, action);
+        }
+
+
+
+
         public async Task<PagedResult<TEntity>> GetPagedAsync(PagingParams pagingParams)
         {
             return await _dbSet.AsNoTracking().ToPagedListAsync(pagingParams);

API/TaskManager.EntityFramework/TaskManager.EntityFramework.csproj

@@ -18,6 +18,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="Z.EntityFramework.Extensions.EFCore" Version="8.103.8.1" />
   </ItemGroup>
 
   <ItemGroup>

API/Wood.Service/Controllers/CherySupplierProAttachmentDataService.cs

@@ -0,0 +1,15 @@
+using TaskManager.Contracts.Dtos;
+using TaskManager.Entity;
+using TaskManager.Entity.Entitys;
+using TaskManager.EntityFramework;
+
+namespace TaskManager.Controllers
+{
+    public class CherySupplierProAttachmentDataService : CheryRecurringJobInputPageController<SUPPLIER_PRO_ATTACHMENT_DATA, SUPPLIER_PRO_ATTACHMENT_DATA_DTO>
+    {
+        public CherySupplierProAttachmentDataService(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository<SUPPLIER_PRO_ATTACHMENT_DATA> repository) : base(httpClient, jobDbContext, log, repository)
+        {
+
+        }
+    }
+}

API/Wood.Service/Controllers/CherySupplierProProcessEquipmentService.cs

@@ -0,0 +1,18 @@
+using TaskManager.Contracts.Dtos;
+using TaskManager.Entity;
+using TaskManager.Entity.Entitys;
+using TaskManager.EntityFramework;
+
+namespace TaskManager.Controllers
+{
+    /// <summary>
+    /// 工艺装备
+    /// </summary>
+    public class CherySupplierProProcessEquipmentService : CheryRecurringJobInputPageController<SUPPLIER_PRO_PROCESS_EQUIPMENT, SUPPLIER_PRO_PROCESS_EQUIPMENT_DTO>
+    {
+        public CherySupplierProProcessEquipmentService(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository<SUPPLIER_PRO_PROCESS_EQUIPMENT> repository) : base(httpClient, jobDbContext, log, repository)
+        {
+
+        }
+    }
+}

API/Wood.Service/Controllers/SUPPLIER_PRO_ATTACHMENT_DATA_Service.cs

@@ -1,6 +0,0 @@
-namespace TaskManager.Controllers
-{
-    public class SUPPLIER_PRO_ATTACHMENT_DATA_Service
-    {
-    }
-}

API/Wood.Service/Controllers/SUPPLIER_PRO_PROCESS_EQUIPMENT_Service.cs

@@ -1,6 +0,0 @@
-namespace TaskManager.Controllers
-{
-    public class SUPPLIER_PRO_PROCESS_EQUIPMENT_Service
-    {
-    }
-}

API/Wood.Service/Controllers/TaskConifgureController.cs

@@ -383,14 +383,22 @@ namespace TaskManager.Controllers
                             TimeZoneInfo.Local
                         );
                         break;
-                    //case "工艺装备":
+                    case "附件类数据":
-                    //    RecurringJob.AddOrUpdate<SUPPLIER_PRO_PROCESS_EQUIPMENT_CONTROLLER>(
+                        RecurringJob.AddOrUpdate<CherySupplierProAttachmentDataService>(
-                    //        task.TaskName,
+                            task.TaskName,
-                    //        x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName),
+                            x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName, client),
-                    //        task.Corn,
+                            task.Corn,
-                    //        TimeZoneInfo.Local
+                            TimeZoneInfo.Local
-                    //    );
+                        );
-                    //    break;
+                        break;
+                    case "工艺装备":
+                        RecurringJob.AddOrUpdate<CherySupplierProProcessEquipmentService>(
+                            task.TaskName,
+                            x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName, client),
+                            task.Corn,
+                            TimeZoneInfo.Local
+                        );
+                        break;
                     case "工艺":
                         RecurringJob.AddOrUpdate<CherySupplierProProcessService>(
                             task.TaskName,

API/Wood.Service/Controllers/TaskSubService.cs

@@ -27,7 +27,6 @@ namespace Wood.Service.Controllers
         {
         }
 
-
         //private async Task<PagedResult<T>> GetDataPagedAsync<T,TService,TDTO>(RequestInputBase input) 
         //    where T : BaseEntity,new()
         //    where TService :CheryRecurringJobInputPageController<T,TDTO> ,new()
@@ -54,17 +53,11 @@ namespace Wood.Service.Controllers
                     var stockservice = _builder.GetRequiredService<CherySupplierProSchedulingService>();
                     var stocktask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
                     requestInputBase.Condition.Filters.Remove(stocktask);
-                    var schedresult = await schedservice.GetDataPaged(requestInputBase);
+                    var stockresult = await stockservice.GetDataPaged(requestInputBase);
-                    return Ok(schedresult.Value);
+                    return Ok(stockresult.Value);
-
-
-
-
-
 
-
+                 
-                    //_builder.GetRequiredService(requestInputBase);
+                   
-                    break;
                 case "SUPPLIER_PRO_SCHEDULING":
 
                     var schedservice = _builder.GetRequiredService<CherySupplierProSchedulingService>();
@@ -135,48 +128,48 @@ namespace Wood.Service.Controllers
                     var flawresult = await flawservice.GetDataPaged(requestInputBase);
                     return Ok(flawresult.Value);
            
-                case "SUPPLIER_PRO_ENVIRONMENT":
+                //case "SUPPLIER_PRO_ENVIRONMENT":
-                    var dataservice = _builder.GetRequiredService<envir>();
+                //    var dataservice = _builder.GetRequiredService<envir>();
-                    var datatask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
+                //    var datatask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
-                    requestInputBase.Condition.Filters.Remove(datatask);
+                //    requestInputBase.Condition.Filters.Remove(datatask);
-                    var dataresult = await dataservice.GetDataPaged(requestInputBase);
+                //    var dataresult = await dataservice.GetDataPaged(requestInputBase);
-                    return Ok(dataresult.Value);
+                //    return Ok(dataresult.Value);
               
-                case "SUPPLIER_PRO_OEE_ACHIEVEMENT_RATE":
+                //case "SUPPLIER_PRO_OEE_ACHIEVEMENT_RATE":
-                    var rateservice = _builder.GetRequiredService<>();
+                //    var rateservice = _builder.GetRequiredService<>();
-                    var ratetask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
+                //    var ratetask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
-                    requestInputBase.Condition.Filters.Remove(datatask);
+                //    requestInputBase.Condition.Filters.Remove(datatask);
-                    var tateresult = await dataservice.GetDataPaged(requestInputBase);
+                //    var tateresult = await dataservice.GetDataPaged(requestInputBase);
-                    return Ok(dataresult.Value);
+                //    return Ok(dataresult.Value);
-                    break;
+                //    break;
-                case "SUPPLIER_PRO_OEE_TIME_DETAILS":
+                //case "SUPPLIER_PRO_OEE_TIME_DETAILS":
-                    var detailservice = _builder.GetRequiredService<>();
+                //    var detailservice = _builder.GetRequiredService<>();
-                    var detailtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
+                //    var detailtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
-                    requestInputBase.Condition.Filters.Remove(datatask);
+                //    requestInputBase.Condition.Filters.Remove(datatask);
-                    var detailresult = await dataservice.GetDataPaged(requestInputBase);
+                //    var detailresult = await dataservice.GetDataPaged(requestInputBase);
-                    return Ok(dataresult.Value);
+                //    return Ok(dataresult.Value);
-                    break;
+                //    break;
-                case "SUPPLIER_PRO_MATERIAL_DATA"://物料主数据
+                //case "SUPPLIER_PRO_MATERIAL_DATA"://物料主数据
-                    var dataservice = _builder.GetRequiredService<>();
+                //    var dataservice = _builder.GetRequiredService<>();
-                    var datatask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
+                //    var datatask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
-                    requestInputBase.Condition.Filters.Remove(datatask);
+                //    requestInputBase.Condition.Filters.Remove(datatask);
-                    var dataresult = await dataservice.GetDataPaged(requestInputBase);
+                //    var dataresult = await dataservice.GetDataPaged(requestInputBase);
-                    return Ok(dataresult.Value);
+                //    return Ok(dataresult.Value);
-                    break;
+                //    break;
-                case "SUPPLIER_PRO_PROCESS_EQUIPMENT":// 工艺装备
+                //case "SUPPLIER_PRO_PROCESS_EQUIPMENT":// 工艺装备
-                    var dataservice = _builder.GetRequiredService<CherySupplierProDataService>();
+                //    var dataservice = _builder.GetRequiredService<CherySupplierProDataService>();
-                    var datatask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
+                //    var datatask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
-                    requestInputBase.Condition.Filters.Remove(datatask);
+                //    requestInputBase.Condition.Filters.Remove(datatask);
-                    var dataresult = await dataservice.GetDataPaged(requestInputBase);
+                //    var dataresult = await dataservice.GetDataPaged(requestInputBase);
-                    return Ok(dataresult.Value);
+                //    return Ok(dataresult.Value);
-                    break;
+                //    break;
-                case "SUPPLIER_PRO_PROCESS"://工艺
+                //case "SUPPLIER_PRO_PROCESS"://工艺
-                    var dataservice = _builder.GetRequiredService<CherySupplierProProcessService>();
+                //    var dataservice = _builder.GetRequiredService<CherySupplierProProcessService>();
-                    var datatask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
+                //    var datatask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
-                    requestInputBase.Condition.Filters.Remove(datatask);
+                //    requestInputBase.Condition.Filters.Remove(datatask);
-                    var dataresult = await dataservice.GetDataPaged(requestInputBase);
+                //    var dataresult = await dataservice.GetDataPaged(requestInputBase);
-                    return Ok(dataresult.Value);
+                //    return Ok(dataresult.Value);
-                    break;
+                //    break;