From 24ff0501f06c17d3de8d365a7bcdd7c802367151 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 11 十一月 2025 17:04:58 +0800
Subject: [PATCH] *

---
 src/main/java/com/zy/asrs/controller/OrderPakoutController.java |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/OrderPakoutController.java b/src/main/java/com/zy/asrs/controller/OrderPakoutController.java
index 1011d48..5903a8b 100644
--- a/src/main/java/com/zy/asrs/controller/OrderPakoutController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderPakoutController.java
@@ -367,8 +367,19 @@
     @RequestMapping(value = "/actual/shipment/order/report/auth")
     @ManagerAuth(memo = "涓婃姤MES瀹為檯缁勮揣鍗�")
     public R actualShipmentOrder(@RequestParam String itemName) {
-        Long userId = getUserId();
+        Long userId = null;
+        try {
+            userId = getUserId();
+            if (Cools.isEmpty(userId)) {
+                return R.error("鐢ㄦ埛寮傚父").add("鐢ㄦ埛寮傚父");
+            }
+        } catch (Exception e){
+            return R.error("鐢ㄦ埛寮傚父").add("鐢ㄦ埛寮傚父");
+        }
         List<OrderPakoutDetailVo> OrderPakoutDetailVoList = orderDetlService.selectOrderPakoutDetailVoListV1(itemName);
+        if (OrderPakoutDetailVoList.isEmpty()) {
+            return R.error("涓婃姤鏄庣粏涓虹┖锛侊紒锛�").add("涓婃姤鏄庣粏涓虹┖锛侊紒锛�");
+        }
         List<String> boxList = new ArrayList<>();
         List<String> rollList = new ArrayList<>();
         for (OrderPakoutDetailVo orderDetl : OrderPakoutDetailVoList){

--
Gitblit v1.9.1