diff --git a/API/TaskManager.EntityFramework/IRepository/IRepository.cs b/API/TaskManager.EntityFramework/IRepository/IRepository.cs
index 2244f0e..20f1727 100644
--- a/API/TaskManager.EntityFramework/IRepository/IRepository.cs
+++ b/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
 {
@@ -19,6 +20,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);
 
 
diff --git a/API/TaskManager.EntityFramework/Repository/Repository.cs b/API/TaskManager.EntityFramework/Repository/Repository.cs
index 337188d..6d1a41d 100644
--- a/API/TaskManager.EntityFramework/Repository/Repository.cs
+++ b/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
 {
@@ -66,6 +67,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);
diff --git a/API/TaskManager.EntityFramework/TaskManager.EntityFramework.csproj b/API/TaskManager.EntityFramework/TaskManager.EntityFramework.csproj
index 3236ca0..9b1e421 100644
--- a/API/TaskManager.EntityFramework/TaskManager.EntityFramework.csproj
+++ b/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>
diff --git a/API/Wood.Service/Controllers/TaskSubService.cs b/API/Wood.Service/Controllers/TaskSubService.cs
index af8a13b..dfbd424 100644
--- a/API/Wood.Service/Controllers/TaskSubService.cs
+++ b/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);
-                    return Ok(schedresult.Value);
-
-
-
-
-
+                    var stockresult = await stockservice.GetDataPaged(requestInputBase);
+                    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":
-                    var dataservice = _builder.GetRequiredService<envir>();
-                    var datatask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
-                    requestInputBase.Condition.Filters.Remove(datatask);
-                    var dataresult = await dataservice.GetDataPaged(requestInputBase);
-                    return Ok(dataresult.Value);
+                //case "SUPPLIER_PRO_ENVIRONMENT":
+                //    var dataservice = _builder.GetRequiredService<envir>();
+                //    var datatask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
+                //    requestInputBase.Condition.Filters.Remove(datatask);
+                //    var dataresult = await dataservice.GetDataPaged(requestInputBase);
+                //    return Ok(dataresult.Value);
               
-                case "SUPPLIER_PRO_OEE_ACHIEVEMENT_RATE":
-                    var rateservice = _builder.GetRequiredService<>();
-                    var ratetask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
-                    requestInputBase.Condition.Filters.Remove(datatask);
-                    var tateresult = await dataservice.GetDataPaged(requestInputBase);
-                    return Ok(dataresult.Value);
-                    break;
-                case "SUPPLIER_PRO_OEE_TIME_DETAILS":
-                    var detailservice = _builder.GetRequiredService<>();
-                    var detailtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
-                    requestInputBase.Condition.Filters.Remove(datatask);
-                    var detailresult = await dataservice.GetDataPaged(requestInputBase);
-                    return Ok(dataresult.Value);
-                    break;
-                case "SUPPLIER_PRO_MATERIAL_DATA"://物料主数据
-                    var dataservice = _builder.GetRequiredService<>();
-                    var datatask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
-                    requestInputBase.Condition.Filters.Remove(datatask);
-                    var dataresult = await dataservice.GetDataPaged(requestInputBase);
-                    return Ok(dataresult.Value);
-                    break;
-                case "SUPPLIER_PRO_PROCESS_EQUIPMENT":// 工艺装备
-                    var dataservice = _builder.GetRequiredService<CherySupplierProDataService>();
-                    var datatask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
-                    requestInputBase.Condition.Filters.Remove(datatask);
-                    var dataresult = await dataservice.GetDataPaged(requestInputBase);
-                    return Ok(dataresult.Value);
-                    break;
-                case "SUPPLIER_PRO_PROCESS"://工艺
-                    var dataservice = _builder.GetRequiredService<CherySupplierProProcessService>();
-                    var datatask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
-                    requestInputBase.Condition.Filters.Remove(datatask);
-                    var dataresult = await dataservice.GetDataPaged(requestInputBase);
-                    return Ok(dataresult.Value);
-                    break;
+                //case "SUPPLIER_PRO_OEE_ACHIEVEMENT_RATE":
+                //    var rateservice = _builder.GetRequiredService<>();
+                //    var ratetask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
+                //    requestInputBase.Condition.Filters.Remove(datatask);
+                //    var tateresult = await dataservice.GetDataPaged(requestInputBase);
+                //    return Ok(dataresult.Value);
+                //    break;
+                //case "SUPPLIER_PRO_OEE_TIME_DETAILS":
+                //    var detailservice = _builder.GetRequiredService<>();
+                //    var detailtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
+                //    requestInputBase.Condition.Filters.Remove(datatask);
+                //    var detailresult = await dataservice.GetDataPaged(requestInputBase);
+                //    return Ok(dataresult.Value);
+                //    break;
+                //case "SUPPLIER_PRO_MATERIAL_DATA"://物料主数据
+                //    var dataservice = _builder.GetRequiredService<>();
+                //    var datatask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
+                //    requestInputBase.Condition.Filters.Remove(datatask);
+                //    var dataresult = await dataservice.GetDataPaged(requestInputBase);
+                //    return Ok(dataresult.Value);
+                //    break;
+                //case "SUPPLIER_PRO_PROCESS_EQUIPMENT":// 工艺装备
+                //    var dataservice = _builder.GetRequiredService<CherySupplierProDataService>();
+                //    var datatask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
+                //    requestInputBase.Condition.Filters.Remove(datatask);
+                //    var dataresult = await dataservice.GetDataPaged(requestInputBase);
+                //    return Ok(dataresult.Value);
+                //    break;
+                //case "SUPPLIER_PRO_PROCESS"://工艺
+                //    var dataservice = _builder.GetRequiredService<CherySupplierProProcessService>();
+                //    var datatask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
+                //    requestInputBase.Condition.Filters.Remove(datatask);
+                //    var dataresult = await dataservice.GetDataPaged(requestInputBase);
+                //    return Ok(dataresult.Value);
+                //    break;