Browse Source

提交

master
赵新宇 2 days ago
parent
commit
a8f64db18a
  1. 6
      API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs
  2. 38
      API/Wood.Service/Controllers/TaskConifgureController.cs

6
API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs

@ -229,6 +229,8 @@ namespace TaskManager.Controllers
int startPage = sub.SyncedPageCount == 0 ? 1 : sub.SyncedPageCount;
int errorNumber = 0;
List<string> errorlist=new List<string>();
for (int i = startPage; i <= totalPages; i++)
{
var records = entites.Skip((i - 1) * pageSize)
@ -314,7 +316,7 @@ namespace TaskManager.Controllers
}
);
}
errorlist.Add($"第 {i} 页奇瑞数据保存失败 {result.message}");
await _logger.AddError($"第 {i} 页奇瑞数据保存失败 {result.message}。", TaskName, sub.TaskId, version,inputjson);
}
}
@ -322,7 +324,7 @@ namespace TaskManager.Controllers
{
await _logger.AddError($"奇瑞{sub.TaskId}任务失败,请检查数据。", TaskName, sub.TaskId, version);
sub.FailedCount = errorNumber * pageSize;
sub.FailedInfo = $"奇瑞{sub.TaskId}任务失败,请检查数据。";
sub.FailedInfo = $"奇瑞{sub.TaskId}任务失败{errorlist.FirstOrDefault()},请检查数据。";
sub.WriteState = true;
_jobDbContext.Set<TaskSub>().Update(sub);
_jobDbContext.SaveChanges();

38
API/Wood.Service/Controllers/TaskConifgureController.cs

@ -78,7 +78,7 @@ namespace TaskManager.Controllers
var taskcount = _context.TaskSub.Count(p => p.TaskName == taskName && p.WriteState == false);
var taskcount = _context.TaskSub.Count(p => p.TaskName == taskName && p.WriteState == false && taskName!= "来料检验数据");
if (taskcount>0)
{
return new JsonResult(new
@ -97,15 +97,14 @@ namespace TaskManager.Controllers
});
}
TaskSub sub = new TaskSub();
sub.Subscriber = "Cherry";
var taskId = Guid.NewGuid();
var task = new TaskSub();
task.TaskId = taskId;
task.TaskName = taskfirst.TaskName+"_手工执行";
task.TaskName = taskfirst.TaskName;
task.Subscriber = "Chery";
task.TableName =taskfirst.TableName;
task.TableName = taskfirst.TableName;
task.DataCount = 1;
task.Domain = "安通林";
task.Site = "安通林";
@ -115,12 +114,12 @@ namespace TaskManager.Controllers
task.CreationTime = DateTime.Now;
task.SyncedPageCount = 0;
task.ReadState = true;
_context.TaskSub.Add(task);
_context.SaveChanges();
await Task.Delay(TimeSpan.FromSeconds(2));
if (taskName != "来料检验数据")
{
_context.TaskSub.Add(task);
_context.SaveChanges();
await Task.Delay(TimeSpan.FromSeconds(2));
}
switch (taskName)
{
case "来料检验数据":
@ -242,6 +241,25 @@ namespace TaskManager.Controllers
TimeSpan.FromSeconds(10)
);
break;
case "供应商共享库存-上午":
BackgroundJob.Schedule<CherySupplierSinvDataService>(
// "process",
x => x.CustomInvokeAsync(taskName, client),
TimeSpan.FromSeconds(10)
);
break;
case "供应商共享库存-下午":
BackgroundJob.Schedule<CherySupplierSinvDataService>(
// "process",
x => x.CustomInvokeAsync(taskName, client),
TimeSpan.FromSeconds(10)
);
break;
}

Loading…
Cancel
Save