From 3e3cd26b19577b4033c6ab8ec45ba37d3392ab94 Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Thu, 19 Dec 2024 16:07:56 +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=E7=94=9F=E4=BA=A7?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=94=9F=E4=BA=A7=E9=A2=86=E6=96=99=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E7=B1=BB=E3=80=81=E7=94=9F=E4=BA=A7=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E7=94=9F=E4=BA=A7=E9=80=80=E6=96=99=E5=8D=95=E4=BB=A3=E5=8A=9E?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E7=B1=BB=E3=80=81=EF=BC=8C=E7=BB=9F=E4=B8=80?=
 =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E6=B5=81=E7=A8=8B=E4=BB=BB=E5=8A=A1=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E7=BB=9F=E4=B8=80=E6=8E=A5=E5=8F=A3=E5=AE=9E=E7=8E=B0?=
 =?UTF-8?q?=E9=87=8C=E9=9D=A2=E7=9A=84handleTask=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=EF=BC=8C=E6=AF=8F=E4=B8=AA=E7=B1=BB=E4=B8=8A=E9=9D=A2@Service?=
 =?UTF-8?q?=E6=B3=A8=E8=A7=A3=E5=8A=A0=E4=B8=8A=E5=AF=B9=E5=BA=94=E7=9A=84?=
 =?UTF-8?q?key=EF=BC=8C=E5=BD=93=E9=80=9A=E7=94=A8=E5=8A=9E=E7=90=86?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BB=8E=E5=89=8D=E7=AB=AF=E4=BC=A0=E5=85=A5?=
 =?UTF-8?q?taskId=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C=E6=89=BE=E5=88=B0?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=AE=9E=E4=BE=8B=E7=B1=BB=EF=BC=8C=E6=89=BE?=
 =?UTF-8?q?=E5=88=B0processDefinitionKey=EF=BC=8C=E4=B8=8D=E5=90=8C?=
 =?UTF-8?q?=E7=9A=84=E6=89=BE=E5=88=B0processDefinitionKey=E4=BC=9A?=
 =?UTF-8?q?=E6=89=BE=E5=88=B0=E5=AF=B9=E5=BA=94=E7=9A=84handleTask?=
 =?UTF-8?q?=E7=B1=BB=EF=BC=8C=E7=94=A8=E4=BA=8E=E8=B7=B3=E8=BD=AC=E4=B8=8D?=
 =?UTF-8?q?=E5=90=8C=E7=9A=84=E6=A8=A1=E5=9D=97=E9=A1=B5=E9=9D=A2=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=BE=85=E5=8A=9E=E4=BA=8B=E9=A1=B9?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=AE=9E=E7=8E=B0=E7=B1=BB=EF=BC=9A=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=8A=E4=B8=8A=E9=9D=A2=E4=BA=8C=E4=B8=AA=E5=8D=95=E6=8D=AE?=
 =?UTF-8?q?=E5=AF=B9=E5=BA=94=E7=9A=84key=E5=92=8Curl=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95=E7=9A=84=E9=80=9A=E8=BF=87?=
 =?UTF-8?q?id=E6=9F=A5=E8=AF=A2=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E7=9A=84=E6=96=B9=E6=B3=95=E8=BF=94=E5=9B=9E=E5=80=BC=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BAVo=E7=B1=BB=EF=BC=8C=E5=AE=A1=E6=89=B9=E7=AA=97?=
 =?UTF-8?q?=E6=89=93=E5=BC=80=E6=96=B9=E6=B3=95=E4=B9=9F=E6=94=B9=E6=88=90?=
 =?UTF-8?q?Vo=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/MakeorderReturnTaskHandler.java      | 42 +++++++++++++++++
 .../impl/MakeorderpickTaskHandler.java        | 46 +++++++++++++++++++
 .../service/impl/IToDoItemServiceImpl.java    |  4 ++
 3 files changed, 92 insertions(+)
 create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/common/handler/impl/MakeorderReturnTaskHandler.java
 create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/common/handler/impl/MakeorderpickTaskHandler.java

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/common/handler/impl/MakeorderReturnTaskHandler.java b/ruoyi-admin/src/main/java/com/ruoyi/common/handler/impl/MakeorderReturnTaskHandler.java
new file mode 100644
index 00000000..d60aff9b
--- /dev/null
+++ b/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);
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/common/handler/impl/MakeorderpickTaskHandler.java b/ruoyi-admin/src/main/java/com/ruoyi/common/handler/impl/MakeorderpickTaskHandler.java
new file mode 100644
index 00000000..7e9ac147
--- /dev/null
+++ b/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);
+
+    }
+}
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 c83f877f..70cbfe3d 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
@@ -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...