|
@@ -2893,7 +2893,7 @@ public class OrderController : BaseController
|
|
var order = await _orderRepository.Queryable()
|
|
var order = await _orderRepository.Queryable()
|
|
.FirstAsync(d => d.WorkflowId == dto.WorkflowId, HttpContext.RequestAborted);
|
|
.FirstAsync(d => d.WorkflowId == dto.WorkflowId, HttpContext.RequestAborted);
|
|
if (order is null)
|
|
if (order is null)
|
|
- throw new UserFriendlyException("无效工单编号");
|
|
|
|
|
|
+ throw UserFriendlyException.SameMessage("无效工单编号");
|
|
//if (await _orderDelayRepository.AnyAsync(x => x.OrderId == order.Id && x.DelayState == EDelayState.Examining, HttpContext.RequestAborted))
|
|
//if (await _orderDelayRepository.AnyAsync(x => x.OrderId == order.Id && x.DelayState == EDelayState.Examining, HttpContext.RequestAborted))
|
|
//{
|
|
//{
|
|
// throw UserFriendlyException.SameMessage("该工单存在正在审核中的延期,不能办理");
|
|
// throw UserFriendlyException.SameMessage("该工单存在正在审核中的延期,不能办理");
|
|
@@ -5223,7 +5223,7 @@ public class OrderController : BaseController
|
|
if (order == null)
|
|
if (order == null)
|
|
throw new UserFriendlyException($"无效工单编号, orderId: {orderId}", "无效工单编号");
|
|
throw new UserFriendlyException($"无效工单编号, orderId: {orderId}", "无效工单编号");
|
|
if (order.IsSigned())
|
|
if (order.IsSigned())
|
|
- throw new UserFriendlyException("该工单已被签收");
|
|
|
|
|
|
+ throw UserFriendlyException.SameMessage("该工单已被签收");
|
|
order.Sign(_sessionContext.RequiredUserId, _sessionContext.UserName);
|
|
order.Sign(_sessionContext.RequiredUserId, _sessionContext.UserName);
|
|
order.AutoAccept(_sessionContext.RequiredUserId, _sessionContext.UserName, _sessionContext.StaffNo);
|
|
order.AutoAccept(_sessionContext.RequiredUserId, _sessionContext.UserName, _sessionContext.StaffNo);
|
|
|
|
|
|
@@ -5867,7 +5867,7 @@ public class OrderController : BaseController
|
|
.Where(d => d.ExternalId == orderId && d.Status != EWorkflowStepStatus.Handled)
|
|
.Where(d => d.ExternalId == orderId && d.Status != EWorkflowStepStatus.Handled)
|
|
.ToListAsync(HttpContext.RequestAborted);
|
|
.ToListAsync(HttpContext.RequestAborted);
|
|
if (steps.Count > 1)
|
|
if (steps.Count > 1)
|
|
- throw new UserFriendlyException("多个待办理节点暂不支持平移");
|
|
|
|
|
|
+ throw UserFriendlyException.SameMessage("多个待办理节点暂不支持平移");
|
|
step = steps.First();
|
|
step = steps.First();
|
|
if (step.BusinessType is not EBusinessType.Center and not EBusinessType.Send)
|
|
if (step.BusinessType is not EBusinessType.Center and not EBusinessType.Send)
|
|
throw UserFriendlyException.SameMessage("当前办理节点非中心暂不支持平移");
|
|
throw UserFriendlyException.SameMessage("当前办理节点非中心暂不支持平移");
|