|
|
@ -147,7 +147,7 @@ public class FlowBeforeController {
|
|
|
|
FlowTaskOperatorEntity operator = flowTaskOperatorService.getInfo(id);
|
|
|
|
FlowTaskOperatorEntity operator = flowTaskOperatorService.getInfo(id);
|
|
|
|
FlowTaskNodeEntity flowTaskNodeEntity = flowTaskNodeService.getById(operator.getTaskNodeId());
|
|
|
|
FlowTaskNodeEntity flowTaskNodeEntity = flowTaskNodeService.getById(operator.getTaskNodeId());
|
|
|
|
FlowTaskEntity flowTask = flowTaskService.getInfo(operator.getTaskId());
|
|
|
|
FlowTaskEntity flowTask = flowTaskService.getInfo(operator.getTaskId());
|
|
|
|
if("end".equals(flowTaskNodeEntity.getNodeNext()) && "398482034802139205".equals(flowTask.getFlowId())){
|
|
|
|
/*if("end".equals(flowTaskNodeEntity.getNodeNext()) && "398482034802139205".equals(flowTask.getFlowId())){
|
|
|
|
//判断当前采购订单的磅单有没有是否垫资为否,并且是否回款为否
|
|
|
|
//判断当前采购订单的磅单有没有是否垫资为否,并且是否回款为否
|
|
|
|
//判断是否开进项票
|
|
|
|
//判断是否开进项票
|
|
|
|
Map<String, Object> map = flowHandleModel.getFormData();
|
|
|
|
Map<String, Object> map = flowHandleModel.getFormData();
|
|
|
@ -165,7 +165,7 @@ public class FlowBeforeController {
|
|
|
|
return ActionResult.fail("存在磅单未垫资且未回款,无法审批通过!");
|
|
|
|
return ActionResult.fail("存在磅单未垫资且未回款,无法审批通过!");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}*/
|
|
|
|
flowTaskNewService.permissions(operator.getHandleId(), flowTask, operator, "");
|
|
|
|
flowTaskNewService.permissions(operator.getHandleId(), flowTask, operator, "");
|
|
|
|
if (FlowNature.ProcessCompletion.equals(operator.getCompletion())) {
|
|
|
|
if (FlowNature.ProcessCompletion.equals(operator.getCompletion())) {
|
|
|
|
FlowModel flowModel = JsonUtil.getJsonToBean(flowHandleModel, FlowModel.class);
|
|
|
|
FlowModel flowModel = JsonUtil.getJsonToBean(flowHandleModel, FlowModel.class);
|
|
|
|