diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java
index a07a9869..9a5b7992 100644
--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java
+++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java
@@ -1164,17 +1164,14 @@ public class StructuralPackageOrderController extends BaseController {
         List<String> trayNos = structuralPackageOrderTrayService.lambdaQuery()
                 .select(WmsStructuralPackageOrderTray::getNo)
                 .eq(WmsStructuralPackageOrderTray::getOrderId, request.getId())
+                .eq(WmsStructuralPackageOrderTray::getState, OrderState.InTransit.getState())
                 .list()
                 .stream()
                 .map(WmsStructuralPackageOrderTray::getNo)
                 .toList();
+        VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(trayNos)).throwMessage("没有需要收货的数据");
         VUtil.trueThrowBusinessError(!new HashSet<>(trayNos).equals(new HashSet<>(request.getTrayNos())))
                 .throwMessage("托盘未齐套");
-        VUtil.trueThrowBusinessError(!structuralPackageOrderTrayService.lambdaQuery()
-                        .eq(WmsStructuralPackageOrderTray::getOrderId, request.getId())
-                        .eq(WmsStructuralPackageOrderTray::getState, OrderState.InTransit.getState())
-                        .exists())
-                .throwMessage("没有需要收货的数据");
         structuralPackageOrderTrayService.lambdaUpdate()
                 .set(WmsStructuralPackageOrderTray::getState, OrderState.Received.getState())
                 .set(WmsStructuralPackageOrderTray::getReceiveBy, UserUtil.getUserName())