From a33764aa5b7c3e9b3bf55d1edc112e0ac79ece19 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 11 十一月 2025 17:11:12 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/controller/OrderPakoutController.java | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 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..c4dfa89 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){
@@ -402,6 +413,7 @@
if (!orderService.updateItemName(itemName, 16L, userId)) {
throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
}
+ return R.ok();
} else {
// 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 17.宸蹭笂鎶�
if (!orderService.updateItemName(itemName, 17L, userId)) {
@@ -430,9 +442,6 @@
);
} catch (Exception e) { log.error("", e); }
}
-
-
-
- return R.ok();
+ return R.error("涓婃姤澶辫触").add("涓婃姤澶辫触");
}
}
--
Gitblit v1.9.1