From a5cc87d5fdd508293a9c79f5af9be0cd9527cf7b Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Thu, 19 Dec 2024 10:57:54 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=20=E5=AE=A1=E6=89=B9=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E7=AE=A1=E7=90=86=20=E6=96=B0=E5=A2=9E=20=E5=B7=A5=E7=A8=8B?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=89=A9=E6=96=99=E5=A4=84=E7=90=86=E7=B1=BB?= =?UTF-8?q?=E3=80=81=E5=B7=A5=E7=A8=8B=E7=AE=A1=E7=90=86Bom=E4=BB=A3?= =?UTF-8?q?=E5=8A=9E=E5=A4=84=E7=90=86=E7=B1=BB=E3=80=81=E5=B7=A5=E7=A8=8B?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=BC=80=E5=8F=91=E4=BF=AE=E6=94=B9=E5=8D=95?= =?UTF-8?q?=E4=BB=A3=E5=8A=9E=E5=A4=84=E7=90=86=E7=B1=BB=E3=80=81=E5=B7=A5?= =?UTF-8?q?=E7=A8=8B=E7=AE=A1=E7=90=86=E5=BC=80=E5=8F=91=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=8D=95=E9=A2=86=E6=96=99=E4=BB=A3=E5=8A=9E=E5=A4=84=E7=90=86?= =?UTF-8?q?=E7=B1=BB=EF=BC=8C=E7=BB=9F=E4=B8=80=E5=AE=9E=E7=8E=B0=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E4=BB=BB=E5=8A=A1=E5=A4=84=E7=90=86=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AE=9E=E7=8E=B0=E9=87=8C=E9=9D=A2=E7=9A=84?= =?UTF-8?q?handleTask=E6=96=B9=E6=B3=95=EF=BC=8C=E6=AF=8F=E4=B8=AA?= =?UTF-8?q?=E7=B1=BB=E4=B8=8A=E9=9D=A2@Service=E6=B3=A8=E8=A7=A3=E5=8A=A0?= =?UTF-8?q?=E4=B8=8A=E5=AF=B9=E5=BA=94=E7=9A=84key=EF=BC=8C=E5=BD=93?= =?UTF-8?q?=E9=80=9A=E7=94=A8=E5=8A=9E=E7=90=86=E5=8A=9F=E8=83=BD=E4=BB=8E?= =?UTF-8?q?=E5=89=8D=E7=AB=AF=E4=BC=A0=E5=85=A5taskId=E7=9A=84=E6=97=B6?= =?UTF-8?q?=E5=80=99=EF=BC=8C=E6=89=BE=E5=88=B0=E6=B5=81=E7=A8=8B=E5=AE=9E?= =?UTF-8?q?=E4=BE=8B=E7=B1=BB=EF=BC=8C=E6=89=BE=E5=88=B0processDefinitionK?= =?UTF-8?q?ey=EF=BC=8C=E4=B8=8D=E5=90=8C=E7=9A=84=E6=89=BE=E5=88=B0process?= =?UTF-8?q?DefinitionKey=E4=BC=9A=E6=89=BE=E5=88=B0=E5=AF=B9=E5=BA=94?= =?UTF-8?q?=E7=9A=84handleTask=E7=B1=BB=EF=BC=8C=E7=94=A8=E4=BA=8E?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E4=B8=8D=E5=90=8C=E7=9A=84=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=20=E4=BF=AE=E6=94=B9=20=E5=BE=85=E5=8A=9E?= =?UTF-8?q?=E4=BA=8B=E9=A1=B9=E6=9C=8D=E5=8A=A1=E5=AE=9E=E7=8E=B0=E7=B1=BB?= =?UTF-8?q?=EF=BC=9A=E5=8A=A0=E4=B8=8A=E4=B8=8A=E9=9D=A2=E5=9B=9B=E4=B8=AA?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E5=AF=B9=E5=BA=94=E7=9A=84key=E5=92=8Curl?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/handler/impl/BomTaskHandler.java | 43 ++++++++++++++++++ .../DevelopModifyOrderPickingTaskHandler.java | 42 ++++++++++++++++++ .../impl/DevelopModifyOrderTaskHandler.java | 42 ++++++++++++++++++ .../handler/impl/MaterialTaskHandler.java | 44 +++++++++++++++++++ .../service/impl/IToDoItemServiceImpl.java | 9 ++++ 5 files changed, 180 insertions(+) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/common/handler/impl/BomTaskHandler.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/common/handler/impl/DevelopModifyOrderPickingTaskHandler.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/common/handler/impl/DevelopModifyOrderTaskHandler.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/common/handler/impl/MaterialTaskHandler.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/common/handler/impl/BomTaskHandler.java b/ruoyi-admin/src/main/java/com/ruoyi/common/handler/impl/BomTaskHandler.java new file mode 100644 index 00000000..ed3fba7b --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/common/handler/impl/BomTaskHandler.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.erp.domain.ErpBomVo; +import com.ruoyi.erp.domain.ErpMaterialVo; +import com.ruoyi.erp.service.IErpBomService; +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; + +/** +* 工程管理Bom代办处理类 +* */ +@Service("erpBom") +public class BomTaskHandler implements TaskHandler { + + @Autowired + private IErpBomService erpBomService; + + + @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); + + ErpBomVo erpBomVo = erpBomService.selectErpBomById(new Long(processInstance.getBusinessKey())); + mmap.put("formData", erpBomVo); + mmap.put("taskId", taskId); + String verifyName = task.getTaskDefinitionKey().substring(0, 1).toUpperCase() + task.getTaskDefinitionKey().substring(1); + mmap.put("verifyName", verifyName); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/common/handler/impl/DevelopModifyOrderPickingTaskHandler.java b/ruoyi-admin/src/main/java/com/ruoyi/common/handler/impl/DevelopModifyOrderPickingTaskHandler.java new file mode 100644 index 00000000..00e7a644 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/common/handler/impl/DevelopModifyOrderPickingTaskHandler.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.erp.domain.vo.ErpDevelopModifyorderPickingVo; +import com.ruoyi.erp.domain.vo.ErpDevelopModifyorderVo; +import com.ruoyi.erp.service.IErpDevelopModifyorderPickingService; +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("developModifyOrderPicking") +public class DevelopModifyOrderPickingTaskHandler implements TaskHandler { + + + @Autowired + private IErpDevelopModifyorderPickingService erpDevelopModifyorderPickingService; + + @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); + + ErpDevelopModifyorderPickingVo erpDevelopModifyorderPickingVo = erpDevelopModifyorderPickingService.selectErpDevelopModifyorderPickingById(new Long(processInstance.getBusinessKey())); + mmap.put("formData", erpDevelopModifyorderPickingVo); + mmap.put("taskId", taskId); + String verifyName = task.getTaskDefinitionKey().substring(0, 1).toUpperCase() + task.getTaskDefinitionKey().substring(1); + mmap.put("verifyName", verifyName); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/common/handler/impl/DevelopModifyOrderTaskHandler.java b/ruoyi-admin/src/main/java/com/ruoyi/common/handler/impl/DevelopModifyOrderTaskHandler.java new file mode 100644 index 00000000..771eef3c --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/common/handler/impl/DevelopModifyOrderTaskHandler.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.erp.domain.ErpMaterialVo; +import com.ruoyi.erp.domain.vo.ErpDevelopModifyorderVo; +import com.ruoyi.erp.service.IErpDevelopModifyorderService; +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("developModifyOrder") +public class DevelopModifyOrderTaskHandler implements TaskHandler { + + @Autowired + private IErpDevelopModifyorderService erpDevelopModifyorderService; + + @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); + + ErpDevelopModifyorderVo erpDevelopModifyorderVo = erpDevelopModifyorderService.selectErpDevelopModifyorderById(new Long(processInstance.getBusinessKey())); + mmap.put("formData", erpDevelopModifyorderVo); + mmap.put("taskId", taskId); + String verifyName = task.getTaskDefinitionKey().substring(0, 1).toUpperCase() + task.getTaskDefinitionKey().substring(1); + mmap.put("verifyName", verifyName); + + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/common/handler/impl/MaterialTaskHandler.java b/ruoyi-admin/src/main/java/com/ruoyi/common/handler/impl/MaterialTaskHandler.java new file mode 100644 index 00000000..f6d9d2a4 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/common/handler/impl/MaterialTaskHandler.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.erp.service.IErpMaterialService; +import com.ruoyi.system.domain.Vo.BaseRequisitioningOrderVo; +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("material") +public class MaterialTaskHandler implements TaskHandler { + + + @Autowired + private IErpMaterialService erpMaterialService; + + + @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); + + ErpMaterialVo erpMaterialVo = erpMaterialService.selectErpMaterialById(new Long(processInstance.getBusinessKey())); + mmap.put("formData", erpMaterialVo); + mmap.put("taskId", taskId); + String verifyName = task.getTaskDefinitionKey().substring(0, 1).toUpperCase() + task.getTaskDefinitionKey().substring(1); + mmap.put("verifyName", verifyName); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/common/service/impl/IToDoItemServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/common/service/impl/IToDoItemServiceImpl.java index 57e98906..0895564a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/common/service/impl/IToDoItemServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/common/service/impl/IToDoItemServiceImpl.java @@ -58,6 +58,15 @@ public class IToDoItemServiceImpl implements IToDoItemService { return "system/baseExpense"; case "evection": return "system/baseEvectionForm"; + case "material": + return "erp/material"; + case "erpBom": + return "erp/bom"; + case "developModifyOrder": + return "erp/developModifyOrder"; + case "developModifyOrderPicking": + return "erp/developModifyorderPicking"; + // 其他case... default: return "defaultPrefix";