From 14c0e668794a8864521ecea3e5daeea269c8c419 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BB=ABUmbrella?= <2539020564@qq.com>
Date: Thu, 19 Mar 2026 09:38:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E8=BD=A6=E8=B0=83=E7=94=A8qm=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../logistics/OrderBoxRefinement.java          |  3 ++-
 .../controller/OrderBindController.java        |  2 +-
 .../desk/logistics/utils/AgvTaskTypeUtil.java  | 18 ++++++++++++++++--
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/blade-ops/blade-job/src/main/java/org/springblade/job/processor/logistics/OrderBoxRefinement.java b/blade-ops/blade-job/src/main/java/org/springblade/job/processor/logistics/OrderBoxRefinement.java
index ef6cd710..a1927b71 100644
--- a/blade-ops/blade-job/src/main/java/org/springblade/job/processor/logistics/OrderBoxRefinement.java
+++ b/blade-ops/blade-job/src/main/java/org/springblade/job/processor/logistics/OrderBoxRefinement.java
@@ -23,6 +23,7 @@ public class OrderBoxRefinement implements BasicProcessor {
     @Override
     public ProcessResult process(TaskContext context) throws Exception {
         client.monitoringStation();
-        return new ProcessResult(true);
+        log.info("执行完成了");
+        return new ProcessResult(true,"执行成功");
     }
 }
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/controller/OrderBindController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/controller/OrderBindController.java
index dc54338a..4a24b877 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/controller/OrderBindController.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/controller/OrderBindController.java
@@ -90,7 +90,7 @@ public class OrderBindController {
             summary = "根据流程卡号查询",
             description = "根据流程卡号查询"
     )
-    public R getCardNo(String cardNo) throws BusinessException {
+    public R getCardNo(@RequestParam String cardNo) throws BusinessException {
         return iYieldOrderService.getCardNo(cardNo);
     }
 
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/utils/AgvTaskTypeUtil.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/utils/AgvTaskTypeUtil.java
index fb94ff28..eec4f90c 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/utils/AgvTaskTypeUtil.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/utils/AgvTaskTypeUtil.java
@@ -48,11 +48,25 @@ public class AgvTaskTypeUtil {
         log.info("起点楼层：{}，终点楼层：{}", startFloor, endFloor);
 
         // 场景4: 输送线起点(1002)或梳齿架 ---> 站点(二层) -> QM3
-        if ((isStartConveyorStart || (startFloor != null && startFloor == 1))
-                && endFloor != null && endFloor == 2) {
+//        if ((isStartConveyorStart || (startFloor != null && startFloor == 1))
+//                && endFloor != null && endFloor == 2) {
+            if (isStartConveyorStart
+                    && endFloor != null && endFloor == 2) {
             log.info("起点(输送线起点/1层梳齿架)到二层站点任务，使用QM3");
             return "QM3";
         }
+        // 场景6: 站点1层 ---> 站点(三层) -> QM13
+        if ((startFloor != null && startFloor == 1)
+                && endFloor != null && endFloor == 2) {
+            log.info("起点(1层梳齿架)到二层站点任务，使用QM13");
+            return "QM13";
+        }
+        // 场景7: 站点3层 ---> 站点(1层) -> QM31
+        if ((startFloor != null && startFloor == 2)
+                && endFloor != null && endFloor == 1) {
+            log.info("起点(3层)到1层站点任务，使用QM31");
+            return "QM31";
+        }
 
         // 场景1: 站点 <-----> 站点 -> QM
         if (startFloor != null && endFloor != null) {