|
@@ -4292,6 +4292,7 @@ public class OrderController : BaseController
|
|
|
var step = await _workflowDomainService.FindLastStepAsync(model.WorkflowId, HttpContext.RequestAborted);
|
|
|
model.StepName = step.Name;
|
|
|
model.StepCode = step.Code;
|
|
|
+ model.Status = order.Status;
|
|
|
|
|
|
//if (!dto.Audit) model.State = 1;
|
|
|
//取消根据进入界面判断是否审批 最新按照系统配置设定
|
|
@@ -4596,7 +4597,12 @@ public class OrderController : BaseController
|
|
|
//}
|
|
|
}
|
|
|
}
|
|
|
- }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ await _orderRepository.Updateable().SetColumns(o => new Orders.Order() { Status = special.Status })
|
|
|
+ .Where(o => o.Id == order.Id).ExecuteCommandAsync(HttpContext.RequestAborted);
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
/// <summary>
|
|
|
/// 批量审批工单特提
|
|
@@ -4700,7 +4706,12 @@ public class OrderController : BaseController
|
|
|
//}
|
|
|
}
|
|
|
}
|
|
|
- }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ await _orderRepository.Updateable().SetColumns(o => new Orders.Order() { Status = special.Status })
|
|
|
+ .Where(o => o.Id == order.Id).ExecuteCommandAsync(HttpContext.RequestAborted);
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
/// <summary>
|