|
|
|
@ -1426,7 +1426,7 @@ namespace Myshipping.Application
|
|
|
|
|
{
|
|
|
|
|
TaskManageOrderResultDto result = new TaskManageOrderResultDto();
|
|
|
|
|
|
|
|
|
|
List<Task<TaskManageOrderResultDto>> taskRunList = new List<Task<TaskManageOrderResultDto>>();
|
|
|
|
|
List<TaskManageOrderResultDto> taskRunList = new List<TaskManageOrderResultDto>();
|
|
|
|
|
|
|
|
|
|
string batchNo = IDGen.NextID().ToString();
|
|
|
|
|
|
|
|
|
@ -1443,15 +1443,15 @@ namespace Myshipping.Application
|
|
|
|
|
foreach (var bk in taskList)
|
|
|
|
|
{
|
|
|
|
|
var sortNo = noList.FirstOrDefault(a => a.id == bk.PK_ID).no;
|
|
|
|
|
taskRunList.Add(Task.Run(() => InnerManualTask(batchNo,bk, TaskOperTypeEnum.COMPLETE_TASK, sortNo)));
|
|
|
|
|
taskRunList.Add(InnerManualTask(batchNo,bk, TaskOperTypeEnum.COMPLETE_TASK, sortNo).GetAwaiter().GetResult());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Task.WaitAll(taskRunList.ToArray());
|
|
|
|
|
//Task.WaitAll(taskRunList.ToArray());
|
|
|
|
|
|
|
|
|
|
result.succ = true;
|
|
|
|
|
result.msg = "执行成功";
|
|
|
|
|
|
|
|
|
|
var downResultList = taskRunList.Select(x => x.Result).ToList();
|
|
|
|
|
var downResultList = taskRunList.Select(x => x).ToList();
|
|
|
|
|
|
|
|
|
|
if (downResultList.Any(x => !x.succ))
|
|
|
|
|
{
|
|
|
|
@ -1585,7 +1585,7 @@ namespace Myshipping.Application
|
|
|
|
|
model.UpdatedUserId = UserManager.UserId;
|
|
|
|
|
model.UpdatedUserName = UserManager.Name;
|
|
|
|
|
|
|
|
|
|
await _taskBaseInfoRepository.AsUpdateable(model).UpdateColumns(it => new
|
|
|
|
|
await _taskBaseInfoRepository.AsUpdateable(model).UpdateColumns(it => new
|
|
|
|
|
{
|
|
|
|
|
it.UpdatedTime,
|
|
|
|
|
it.UpdatedUserId,
|
|
|
|
@ -1622,7 +1622,7 @@ namespace Myshipping.Application
|
|
|
|
|
|
|
|
|
|
string batchNo = IDGen.NextID().ToString();
|
|
|
|
|
|
|
|
|
|
List<Task<TaskManageOrderResultDto>> taskRunList = new List<Task<TaskManageOrderResultDto>>();
|
|
|
|
|
List<TaskManageOrderResultDto> taskRunList = new List<TaskManageOrderResultDto>();
|
|
|
|
|
|
|
|
|
|
_logger.LogInformation("批次={no} ids={ids} 取消任务开始", batchNo, string.Join(",", PKIds));
|
|
|
|
|
|
|
|
|
@ -1637,15 +1637,15 @@ namespace Myshipping.Application
|
|
|
|
|
foreach (var bk in taskList)
|
|
|
|
|
{
|
|
|
|
|
var sortNo = noList.FirstOrDefault(a => a.id == bk.PK_ID).no;
|
|
|
|
|
taskRunList.Add(Task.Run(() => InnerManualTask(batchNo, bk, TaskOperTypeEnum.CANCEL_TASK, sortNo)));
|
|
|
|
|
taskRunList.Add(InnerManualTask(batchNo, bk, TaskOperTypeEnum.CANCEL_TASK, sortNo).GetAwaiter().GetResult());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Task.WaitAll(taskRunList.ToArray());
|
|
|
|
|
//Task.WaitAll(taskRunList.ToArray());
|
|
|
|
|
|
|
|
|
|
result.succ = true;
|
|
|
|
|
result.msg = "执行成功";
|
|
|
|
|
|
|
|
|
|
var downResultList = taskRunList.Select(x => x.Result).ToList();
|
|
|
|
|
var downResultList = taskRunList.Select(x => x).ToList();
|
|
|
|
|
|
|
|
|
|
if (downResultList.Any(x => !x.succ))
|
|
|
|
|
{
|
|
|
|
@ -1705,7 +1705,7 @@ namespace Myshipping.Application
|
|
|
|
|
|
|
|
|
|
_logger.LogInformation("批次={no} ids={ids} 挂起任务开始", batchNo, string.Join(",", PKIds));
|
|
|
|
|
|
|
|
|
|
List<Task<TaskManageOrderResultDto>> taskRunList = new List<Task<TaskManageOrderResultDto>>();
|
|
|
|
|
List<TaskManageOrderResultDto> taskRunList = new List<TaskManageOrderResultDto>();
|
|
|
|
|
|
|
|
|
|
try
|
|
|
|
|
{
|
|
|
|
@ -1718,15 +1718,15 @@ namespace Myshipping.Application
|
|
|
|
|
foreach (var bk in taskList)
|
|
|
|
|
{
|
|
|
|
|
var sortNo = noList.FirstOrDefault(a => a.id == bk.PK_ID).no;
|
|
|
|
|
taskRunList.Add(Task.Run(() => InnerManualTask(batchNo, bk, TaskOperTypeEnum.PENDING_TASK, sortNo)));
|
|
|
|
|
taskRunList.Add(InnerManualTask(batchNo, bk, TaskOperTypeEnum.PENDING_TASK, sortNo).GetAwaiter().GetResult());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Task.WaitAll(taskRunList.ToArray());
|
|
|
|
|
//Task.WaitAll(taskRunList.ToArray());
|
|
|
|
|
|
|
|
|
|
result.succ = true;
|
|
|
|
|
result.msg = "执行成功";
|
|
|
|
|
|
|
|
|
|
var downResultList = taskRunList.Select(x => x.Result).ToList();
|
|
|
|
|
var downResultList = taskRunList.Select(x => x).ToList();
|
|
|
|
|
|
|
|
|
|
if (downResultList.Any(x => !x.succ))
|
|
|
|
|
{
|
|
|
|
|