添加任务查找服务

API/TaskManager.Contracts/Dtos/10_17/SUPPLIER_PRO_MATERIAL_DATA_DTO.cs

@@ -36,7 +36,7 @@ namespace TaskManager.Entity.Entitys
         /// </summary>
         [ExporterHeader(DisplayName = "类型")]
         [ImporterHeader(Name = "类型")]
-        public decimal Type { get; set; }
+        public string Type { get; set; }
         /// <summary>
         /// 供应商零件版本号
         /// </summary>

API/TaskManager.Entity/11-18/SUPPLIER_PRO_MATERIAL_DATA.cs

@@ -36,7 +36,7 @@ namespace TaskManager.Entity.Entitys
         /// </summary>
         [ExporterHeader(DisplayName = "类型")]
         [ImporterHeader(Name = "类型")]
-        public decimal Type { get; set; }
+        public string Type { get; set; }
         /// <summary>
         /// 供应商零件版本号
         /// </summary>

API/TaskManager.EntityFramework/Migrations/20250620074909_z202506200003.cs

@@ -0,0 +1,22 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace TaskManager.EntityFramework.Migrations
+{
+    /// <inheritdoc />
+    public partial class z202506200003 : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+
+        }
+    }
+}

API/Wood.Service/Controllers/CherySupplierSinvDataService.cs

@@ -6,7 +6,7 @@ using TaskManager.EntityFramework;
 
 namespace TaskManager.Controllers
 {
-    public class CherySupplierSinvDataService : CheryRecurringJobInputPageController<SUPPLIER_SINV_DATA, SUPPLIER_SINV_DATA_DTO, SUPPLIER_SINV_DATA_LOGS>
+    public class CherySupplierSinvDataService : CheryRecurringJobInputPageExtendController<SUPPLIER_SINV_DATA, SUPPLIER_SINV_DATA_DTO, SUPPLIER_SINV_DATA_LOGS>
     {
         public CherySupplierSinvDataService(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository<SUPPLIER_SINV_DATA> repository) : base(httpClient, jobDbContext, log, repository)
         {

API/Wood.Service/Controllers/TaskConifgureController.cs

@@ -84,7 +84,7 @@ namespace TaskManager.Controllers
                 return new JsonResult(new
                 {
                     code = 400,
-                    message = "请勿重复执行任务或上次提交任务发生错误未完成"
+                    message = "请勿重复执行任务，或上次提交任务发生错误未完成"
                 });
             }
             var taskfirst=_context.TaskConifgure.FirstOrDefault(p => p.TaskName == taskName && p.Client == client);
@@ -118,7 +118,7 @@ namespace TaskManager.Controllers
 
             _context.TaskSub.Add(task);
             _context.SaveChanges();
-            await Task.Delay(TimeSpan.FromSeconds(3));
+            await Task.Delay(TimeSpan.FromSeconds(2));
 
 
             switch (taskName)
@@ -242,6 +242,8 @@ namespace TaskManager.Controllers
                         TimeSpan.FromSeconds(10)
                     );
                     break;
+            
+                   
             }
 
 
@@ -277,8 +279,6 @@ namespace TaskManager.Controllers
                     var client = task.Client;
                     await AddOrUpdateTask(task);
                     int result=_context.SaveChanges();
-                   
-
                     return new JsonResult(new { Code = 200, Message = $"{task.TaskName}设置为自动执行！" }); ;
                     //return new JsonResult("200", $"{task.TaskName}设置为自动执行！");
                 }

API/Wood.Service/Controllers/TaskSubService.cs

@@ -204,7 +204,12 @@ namespace Wood.Service.Controllers
                     requestInputBase.Condition.Filters.Remove(con_potask);
                     var con_poresult = await con_poservice.GetTaskDataPaged(requestInputBase);
                     return Ok(con_poresult);
-
+                case "SUPPLIER_SINV_DATA"://
+                    var service1 = _builder.GetRequiredService<CherySupplierSinvDataService>();
+                    var table = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
+                    requestInputBase.Condition.Filters.Remove(table);
+                    var result1 = await service1.GetLogDataPaged(requestInputBase);
+                    return Ok(result1);
 
 
             }