From d10c449420be02baa6001e83415d71b5ae2fe148 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Sat, 21 Sep 2024 16:30:33 +0800
Subject: [PATCH] =?UTF-8?q?9/21=20=E4=BC=98=E5=8C=961.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../glxp/api/controller/basic/BasicSkPrescribeController.java   | 2 +-
 .../glxp/api/controller/collect/IoCollectOrderController.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/basic/BasicSkPrescribeController.java b/src/main/java/com/glxp/api/controller/basic/BasicSkPrescribeController.java
index 4eb992db5..1a934d7cb 100644
--- a/src/main/java/com/glxp/api/controller/basic/BasicSkPrescribeController.java
+++ b/src/main/java/com/glxp/api/controller/basic/BasicSkPrescribeController.java
@@ -128,7 +128,7 @@ public class BasicSkPrescribeController extends BaseController {
                 CollectOrderRequest collectOrderRequest = new CollectOrderRequest();
                 for (IoCollectOrder ioCollectOrder : list) {
                     collectOrderRequest.setBillNo(ioCollectOrder.getBillNo());
-                    collectOrderRequest.setBusType(ioCollectOrder.getBusType());
+                    collectOrderRequest.setBusType(sickerPrescribeSaveRequest.getBusType());
                     return downloadFactory.downloadOrder(collectOrderRequest);
                 }
             }
diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java
index b2e66c454..73865dd1e 100644
--- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java
+++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java
@@ -134,7 +134,7 @@ public class IoCollectOrderController extends BaseController {
         if (CollUtil.isNotEmpty(orderResponses))
             return ResultVOUtils.success(orderResponses.get(0));
 
-        return ResultVOUtils.error(500, "未查到待处理单据");
+        return ResultVOUtils.error(500, "该工位已无待处理单据");
     }
 
     @Resource