From 7af3ec23f201d7d568e10b9399e8db6d3cb22a4d Mon Sep 17 00:00:00 2001
From: Huluwa22 <2667400744@qq.com>
Date: Sat, 8 Mar 2025 15:28:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=A3=E8=B4=A7=E4=BB=BB=E5=8A=A1=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0;=E6=8B=A3=E8=B4=A7=E5=AE=8C=E6=88=90=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/web/controller/app/AppTaskController.java   | 3 ++-
 .../src/main/java/com/ruoyi/quartz/task/TaskExecutor.java      | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppTaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppTaskController.java
index 099758df..e09d29d3 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppTaskController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppTaskController.java
@@ -1163,6 +1163,7 @@ public class AppTaskController extends BaseController
     @Anonymous
     @PostMapping("/pickComplete")
     public AjaxResult pickComplete(@RequestBody List<PickCompleteReq> requests) {
+        logger.info("请求参数{}", JSON.toJSONString(requests));
         for(PickCompleteReq request : requests) {
             if(request == null || StringUtils.isEmpty(request.getTaskId()) || request.getPickNum() == null) {
                 return error("请求参数不能为空");
@@ -1178,7 +1179,7 @@ public class AppTaskController extends BaseController
             if (selectTask.getTaskType() != 2) {
                 return error("该任务不是拣货任务，请检查！");
             }
-            if (selectTask.getTaskStatus() != 4) {
+            if (selectTask.getTaskStatus() != 5) {
                 return error("该任务状态不是待捡货，请检查！");
             }
         }
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/TaskExecutor.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/TaskExecutor.java
index a3b2a5d2..b84a67ee 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/TaskExecutor.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/TaskExecutor.java
@@ -171,6 +171,7 @@ public class TaskExecutor {
         completeNormalInTask(); // 通常入库任务
         completeNormalOutTask(); // 通常出库任务
         completeNormalMoveTask(); // 通常移库任务
+        completePickOutTask();// 拣货任务
     }
 
     /**