Browse Source

[feat] 审批模块管理

新增 委外管理委外报价代办处理类、委外管理委外订单代办处理类、委外管理委外领料代办处理类,统一实现流程任务处理统一接口实现里面的handleTask方法,每个类上面@Service注解加上对应的key,当通用办理功能从前端传入taskId的时候,找到流程实例类,找到processDefinitionKey,不同的找到processDefinitionKey会找到对应的handleTask类,用于跳转不同的模块页面
修改
待办事项服务实现类:加上上面三个单据对应的key和url
修改采购订单的通过id查询采购订单的方法返回值改为Vo类,审批窗打开方法也改成Vo类
dev
liuxiaoxu 2 months ago
parent
commit
bd5fb2c81e
  1. 44
      ruoyi-admin/src/main/java/com/ruoyi/common/handler/impl/OutsourceOrderTaskHandler.java
  2. 44
      ruoyi-admin/src/main/java/com/ruoyi/common/handler/impl/OutsourceQuoteTaskHandler.java
  3. 43
      ruoyi-admin/src/main/java/com/ruoyi/common/handler/impl/OutsourceRequisitionTaskHandler.java
  4. 7
      ruoyi-admin/src/main/java/com/ruoyi/common/service/impl/IToDoItemServiceImpl.java

44
ruoyi-admin/src/main/java/com/ruoyi/common/handler/impl/OutsourceOrderTaskHandler.java

@ -0,0 +1,44 @@
package com.ruoyi.common.handler.impl;
import com.ruoyi.common.handler.TaskHandler;
import com.ruoyi.common.service.IToDoItemService;
import com.ruoyi.system.domain.Vo.OutsourceOrderVO;
import com.ruoyi.system.domain.Vo.OutsourceQuoteVO;
import com.ruoyi.system.service.IOutsourceOrderService;
import org.activiti.engine.TaskService;
import org.activiti.engine.runtime.ProcessInstance;
import org.activiti.engine.task.Task;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.ui.ModelMap;
/**
* 委外管理委外订单代办处理类
* */
@Service("outsourceOrder")
public class OutsourceOrderTaskHandler implements TaskHandler {
@Autowired
private IOutsourceOrderService outsourceOrderService;
@Autowired
private TaskService taskService;
@Autowired
private IToDoItemService toDoItemService;
@Override
public void handleTask(String taskId, ModelMap mmap) {
Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
// 业务逻辑...
ProcessInstance processInstance = toDoItemService.getProcessInstance(taskId);
OutsourceOrderVO outsourceOrderVO = outsourceOrderService.selectOutsourceOrderByOutsourceOrderId(new Long(processInstance.getBusinessKey()));
mmap.put("formData", outsourceOrderVO);
mmap.put("taskId", taskId);
String verifyName = task.getTaskDefinitionKey().substring(0, 1).toUpperCase() + task.getTaskDefinitionKey().substring(1);
mmap.put("verifyName", verifyName);
}
}

44
ruoyi-admin/src/main/java/com/ruoyi/common/handler/impl/OutsourceQuoteTaskHandler.java

@ -0,0 +1,44 @@
package com.ruoyi.common.handler.impl;
import com.ruoyi.common.handler.TaskHandler;
import com.ruoyi.common.service.IToDoItemService;
import com.ruoyi.erp.domain.ErpMaterialVo;
import com.ruoyi.system.domain.Vo.OutsourceQuoteVO;
import com.ruoyi.system.service.IOutsourceQuoteService;
import org.activiti.engine.TaskService;
import org.activiti.engine.runtime.ProcessInstance;
import org.activiti.engine.task.Task;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.ui.ModelMap;
/**
* 委外管理委外报价代办处理类
* */
@Service("outsourceQuote")
public class OutsourceQuoteTaskHandler implements TaskHandler {
@Autowired
private IOutsourceQuoteService outsourceQuoteService;
@Autowired
private TaskService taskService;
@Autowired
private IToDoItemService toDoItemService;
@Override
public void handleTask(String taskId, ModelMap mmap) {
Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
// 业务逻辑...
ProcessInstance processInstance = toDoItemService.getProcessInstance(taskId);
OutsourceQuoteVO outsourceQuoteVO = outsourceQuoteService.selectOutsourceQuoteByOutsourceQuoteId(new Long(processInstance.getBusinessKey()));
mmap.put("formData", outsourceQuoteVO);
mmap.put("taskId", taskId);
String verifyName = task.getTaskDefinitionKey().substring(0, 1).toUpperCase() + task.getTaskDefinitionKey().substring(1);
mmap.put("verifyName", verifyName);
}
}

43
ruoyi-admin/src/main/java/com/ruoyi/common/handler/impl/OutsourceRequisitionTaskHandler.java

@ -0,0 +1,43 @@
package com.ruoyi.common.handler.impl;
import com.ruoyi.common.handler.TaskHandler;
import com.ruoyi.common.service.IToDoItemService;
import com.ruoyi.system.domain.Vo.OutsourceQuoteVO;
import com.ruoyi.system.domain.Vo.OutsourceRequisitionVO;
import com.ruoyi.system.service.IOutsourceRequisitionService;
import org.activiti.engine.TaskService;
import org.activiti.engine.runtime.ProcessInstance;
import org.activiti.engine.task.Task;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.ui.ModelMap;
/**
* 委外管理委外领料代办处理类
* */
@Service("outsourceRequisition")
public class OutsourceRequisitionTaskHandler implements TaskHandler {
@Autowired
private IOutsourceRequisitionService outsourceRequisitionService;
@Autowired
private TaskService taskService;
@Autowired
private IToDoItemService toDoItemService;
@Override
public void handleTask(String taskId, ModelMap mmap) {
Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
// 业务逻辑...
ProcessInstance processInstance = toDoItemService.getProcessInstance(taskId);
OutsourceRequisitionVO outsourceRequisitionVO = outsourceRequisitionService.selectOutsourceRequisitionByOutsourceRequisitionId(new Long(processInstance.getBusinessKey()));
mmap.put("formData", outsourceRequisitionVO);
mmap.put("taskId", taskId);
String verifyName = task.getTaskDefinitionKey().substring(0, 1).toUpperCase() + task.getTaskDefinitionKey().substring(1);
mmap.put("verifyName", verifyName);
}
}

7
ruoyi-admin/src/main/java/com/ruoyi/common/service/impl/IToDoItemServiceImpl.java

@ -76,7 +76,12 @@ public class IToDoItemServiceImpl implements IToDoItemService {
return "system/makeorderpick";
case "makeorderReturn":
return "system/makeReturnOrder";
case "outsourceQuote":
return "system/outsource_quote";
case "outsourceOrder":
return "system/outsource_order";
case "outsourceRequisition":
return "system/outsource_requisition";
// 其他case...
default:

Loading…
Cancel
Save