Browse Source

[feat] 审批模块管理

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

42
ruoyi-admin/src/main/java/com/ruoyi/common/handler/impl/MakeorderReturnTaskHandler.java

@ -0,0 +1,42 @@
package com.ruoyi.common.handler.impl;
import com.ruoyi.common.handler.TaskHandler;
import com.ruoyi.common.service.IToDoItemService;
import com.ruoyi.system.domain.SysMakeorderPick;
import com.ruoyi.system.domain.Vo.MakeReturnOrderVO;
import com.ruoyi.system.service.IMakeReturnOrderService;
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("makeorderReturn")
public class MakeorderReturnTaskHandler implements TaskHandler {
@Autowired
private IMakeReturnOrderService makeReturnOrderService;
@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);
MakeReturnOrderVO makeReturnOrderVO = makeReturnOrderService.selectMakeReturnOrderById(new Long(processInstance.getBusinessKey()));
mmap.put("formData", makeReturnOrderVO);
mmap.put("taskId", taskId);
String verifyName = task.getTaskDefinitionKey().substring(0, 1).toUpperCase() + task.getTaskDefinitionKey().substring(1);
mmap.put("verifyName", verifyName);
}
}

46
ruoyi-admin/src/main/java/com/ruoyi/common/handler/impl/MakeorderpickTaskHandler.java

@ -0,0 +1,46 @@
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.SysMakeorderPick;
import com.ruoyi.system.domain.SysMakeorderPickVo;
import com.ruoyi.system.service.ISysMakeorderPickService;
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("makeorderpick")
public class MakeorderpickTaskHandler implements TaskHandler {
@Autowired
private ISysMakeorderPickService sysMakeorderPickService;
@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);
SysMakeorderPick makeorderPick = sysMakeorderPickService.selectSysMakeorderPickById(new Long(processInstance.getBusinessKey()));
mmap.put("formData", makeorderPick);
mmap.put("taskId", taskId);
String verifyName = task.getTaskDefinitionKey().substring(0, 1).toUpperCase() + task.getTaskDefinitionKey().substring(1);
mmap.put("verifyName", verifyName);
}
}

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

@ -72,6 +72,10 @@ public class IToDoItemServiceImpl implements IToDoItemService {
return "purchase/purchaseQuote";
case "purchaseOrder":
return "purchase/purchaseOrder";
case "makeorderpick":
return "system/makeorderpick";
case "makeorderReturn":
return "system/makeReturnOrder";
// 其他case...

Loading…
Cancel
Save