From 1a21b74d11317541e776a9ee8ee7847ec77e6de3 Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期二, 31 三月 2026 00:10:21 +0800
Subject: [PATCH] 订单出库 try
---
src/main/java/com/zy/asrs/controller/OutController.java | 38 +++++++++++++++++++++++---------------
1 files changed, 23 insertions(+), 15 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..7bb2e66 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -120,7 +120,7 @@
@PostMapping("/out/pakout/auth")
@ManagerAuth(memo = "璁㈠崟鍑哄簱")
@Transactional
- public synchronized R pakout(@RequestBody List<LocDto> locDtos) throws InterruptedException {
+ public synchronized R pakout(@RequestBody List<LocDto> locDtos) throws Exception {
log.info("璁㈠崟鍑哄簱:{}", locDtos);
//鍒ゆ柇鏄惁鍙互鐢熸垚鍑哄簱宸ヤ綔妗�
boolean lack = true;
@@ -142,23 +142,31 @@
}
Thread.sleep(500L);
- // 璁㈠崟棰勬牎楠� ===>> 1.璁㈠崟鐘舵�侊紱 2.璁㈠崟甯﹀嚭鏁伴噺
- List<OrderDto> orderDtos = orderPreVerification(locDtos);
+ try {
+ boolean debugd = false;
+ if(debugd){
+ throw new RuntimeException("debug rollback");
+ }
+ // 璁㈠崟棰勬牎楠� ===>> 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 (Exception e) {
+ log.error("璁㈠崟鍑哄簱寮傚父", e);
+ throw e;
}
- return R.ok();
}
--
Gitblit v1.9.1