From 0983e7a47d882fb81661c2d280d5e06a9f77eb1e Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期一, 30 三月 2026 15:35:04 +0800
Subject: [PATCH] 订单出库 try

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

diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index b2712a9..78e5d62 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -142,23 +142,31 @@
         }
         Thread.sleep(500L);
 
-        // 璁㈠崟棰勬牎楠�  ===>> 1.璁㈠崟鐘舵�侊紱 2.璁㈠崟甯﹀嚭鏁伴噺
-        List<OrderDto> orderDtos = orderPreVerification(locDtos);
+        try {
+            // 璁㈠崟棰勬牎楠�  ===>> 1.璁㈠崟鐘舵�侊紱 2.璁㈠崟甯﹀嚭鏁伴噺
+            List<OrderDto> orderDtos = orderPreVerification(locDtos);
 
-        List<TaskDto> taskDtos = new ArrayList<>();
-        List<TaskDto> agvTaskDtos = new ArrayList<>();
-        generateTaskDto(locDtos,taskDtos,agvTaskDtos);
+            List<TaskDto> taskDtos = new ArrayList<>();
+            List<TaskDto> agvTaskDtos = new ArrayList<>();
+            generateTaskDto(locDtos, taskDtos, agvTaskDtos);
 
-        //鐢熸垚AGV鍑哄簱浠诲姟
-        agvWorkService.stockOutWrkMast(agvTaskDtos, getUserId());
+            //鐢熸垚AGV鍑哄簱浠诲姟
+            agvWorkService.stockOutWrkMast(agvTaskDtos, getUserId());
 
-        // 鐢熸垚鍑哄簱浠诲姟
-        taskDtos.stream().map(TaskDto::getLocNo).distinct().collect(Collectors.toList());
-        for (TaskDto taskDto : taskDtos) {
-            BasDevp staNo = basDevpService.checkSiteStatus(taskDto.getStaNo());
-            workService.stockOut(staNo, taskDto, getUserId());
+            // 鐢熸垚鍑哄簱浠诲姟
+            taskDtos.stream().map(TaskDto::getLocNo).distinct().collect(Collectors.toList());
+            for (TaskDto taskDto : taskDtos) {
+                BasDevp staNo = basDevpService.checkSiteStatus(taskDto.getStaNo());
+                workService.stockOut(staNo, taskDto, getUserId());
+            }
+            return R.ok();
+        } catch (CoolException e) {
+            throw e;
+        } catch (Exception e) {
+            log.error("璁㈠崟鍑哄簱寮傚父", e);
+            String msg = e.getMessage();
+            throw new CoolException("璁㈠崟鍑哄簱澶辫触" + (Cools.isEmpty(msg) ? "" : "锛�" + msg));
         }
-        return R.ok();
     }
 
 

--
Gitblit v1.9.1