From 2968905d159e3a0287326d6b742a3bee3626fc76 Mon Sep 17 00:00:00 2001
From: "ZHOUZ\\Noble'lift" <1014987728@qq.com>
Date: Wed, 13 Mar 2024 17:50:50 +0800
Subject: [PATCH] =?UTF-8?q?rev:=E6=8F=90=E7=A4=BA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java  | 2 +-
 .../java/org/nl/wms/pda/mps/service/impl/OutServiceImpl.java  | 4 ++--
 .../org/nl/wms/pda/mps/service/impl/ShippingServiceImpl.java  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
index f739b71f7..74efb63a3 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
@@ -433,7 +433,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
                     }
 
                     if (ObjectUtil.isEmpty(struct_jo)) {
-                        throw new BadRequestException("未查询到可用的空载具！");
+                        throw new BadRequestException("未查询到可用的空载具或当前载具存在任务！！");
                     }
 
                     JSONObject task_jo = new JSONObject();
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/OutServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/OutServiceImpl.java
index 2f122ac1c..de53cbe50 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/OutServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/OutServiceImpl.java
@@ -142,7 +142,7 @@ public class OutServiceImpl implements OutService {
             }
 
             if (ObjectUtil.isEmpty(empty_vehicle)) {
-                throw new BadRequestException("未查询到可用的空载具！");
+                throw new BadRequestException("未查询到可用的空载具或当前载具存在任务！！");
             }
 
             JSONObject jo = new JSONObject();
@@ -226,7 +226,7 @@ public class OutServiceImpl implements OutService {
                     .addParam("point_location", cut_ivt.getString("point_location"))
                     .addParam("flag", "303").process().uniqueResult(0);
             if (ObjectUtil.isEmpty(empty_vehicle)) {
-                throw new BadRequestException("未查询到可用的空载具！");
+                throw new BadRequestException("未查询到可用的空载具或当前载具存在任务！！");
             }
         }
 
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/ShippingServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/ShippingServiceImpl.java
index ec8915e17..b6755f333 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/ShippingServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/ShippingServiceImpl.java
@@ -66,7 +66,7 @@ public class ShippingServiceImpl implements ShippingService {
                 .addParam("point_location", cut_jo.getString("point_location"))
                 .addParam("flag", "302").process().uniqueResult(0);
         if (ObjectUtil.isEmpty(empty_vehicle)) {
-            throw new BadRequestException("未查询到可用的空载具！");
+            throw new BadRequestException("未查询到可用的空载具或当前载具存在任务！！");
         }
 
         //如果查询到给ACS下发一个输送线任务