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 | 96 +++++++++++++++++++++++++++---------------------
1 files changed, 54 insertions(+), 42 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 3cf87c2..78e5d62 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -77,37 +77,41 @@
List<LocDto> locDtoList = new ArrayList<>();
for (OrderDetl orderDetl : orderDetlList) {
- double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getQty()).orElse(0.0D);
- Order order = orderService.selectByNo(orderDetl.getOrderNo());
- DocType docType = docTypeService.selectById(order.getDocType());
- if("浜哄伐琛ヨ揣鍗�".equals(docType.getDocName())){
- if (issued <= 0.0D) { continue; }
- issued = locDetlService.queryStockAndSetLocDto1(orderDetl.getMatnr(),orderDetl.getBatch(),orderDetl.getOrderNo(),locDtoList,issued,orderDetl.getThreeCode(),orderDetl.getDeadTime());
- if (issued > 0) {
- LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
- locDto.setLack(Boolean.TRUE);
- locDtoList.add(locDto);
+ try {
+ double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getQty()).orElse(0.0D);
+ Order order = orderService.selectByNo(orderDetl.getOrderNo());
+ DocType docType = docTypeService.selectById(order.getDocType());
+ if("浜哄伐琛ヨ揣鍗�".equals(docType.getDocName())){
+ if (issued <= 0.0D) { continue; }
+ issued = locDetlService.queryStockAndSetLocDto1(orderDetl.getMatnr(),orderDetl.getBatch(),orderDetl.getOrderNo(),locDtoList,issued,orderDetl.getThreeCode(),orderDetl.getDeadTime());
+ if (issued > 0) {
+ LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
+ locDto.setLack(Boolean.TRUE);
+ locDtoList.add(locDto);
+ }
+ }else {
+ if (issued <= 0.0D) { continue; }
+
+ //浠庡钩搴撳鎵�
+ issued = manLocDetlService.queryStockAndSetLocDto(orderDetl.getMatnr(),orderDetl.getBatch(),orderDetl.getOrderNo(),locDtoList,issued,orderDetl.getThreeCode(),orderDetl.getDeadTime());
+
+ //鍏堟壘AGV鐨勫簱瀛橈紝濡傛灉杩斿洖鐨刬ssued澶т簬0锛屽垯鍘诲洓椤瑰簱鎵�
+ issued = agvLocDetlService.queryStockAndSetLocDto(orderDetl.getMatnr(),orderDetl.getBatch(),orderDetl.getOrderNo(),locDtoList,issued,orderDetl.getThreeCode(),orderDetl.getDeadTime());
+
+ //浠庡洓椤瑰簱鐨勫簱瀛橀噷闈㈡壘锛�
+ issued = locDetlService.queryStockAndSetLocDto(orderDetl.getMatnr(),orderDetl.getBatch(),orderDetl.getOrderNo(),locDtoList,issued,orderDetl.getThreeCode(),orderDetl.getDeadTime());
+
+ if (issued > 0) {
+ LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
+ locDto.setLack(Boolean.TRUE);
+ locDtoList.add(locDto);
+ }
}
- }else {
- if (issued <= 0.0D) { continue; }
-
- //浠庡钩搴撳鎵�
- issued = manLocDetlService.queryStockAndSetLocDto(orderDetl.getMatnr(),orderDetl.getBatch(),orderDetl.getOrderNo(),locDtoList,issued,orderDetl.getThreeCode(),orderDetl.getDeadTime());
-
- //鍏堟壘AGV鐨勫簱瀛橈紝濡傛灉杩斿洖鐨刬ssued澶т簬0锛屽垯鍘诲洓椤瑰簱鎵�
- issued = agvLocDetlService.queryStockAndSetLocDto(orderDetl.getMatnr(),orderDetl.getBatch(),orderDetl.getOrderNo(),locDtoList,issued,orderDetl.getThreeCode(),orderDetl.getDeadTime());
-
- //浠庡洓椤瑰簱鐨勫簱瀛橀噷闈㈡壘锛�
- issued = locDetlService.queryStockAndSetLocDto(orderDetl.getMatnr(),orderDetl.getBatch(),orderDetl.getOrderNo(),locDtoList,issued,orderDetl.getThreeCode(),orderDetl.getDeadTime());
-
- if (issued > 0) {
- LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
- locDto.setLack(Boolean.TRUE);
- locDtoList.add(locDto);
- }
+ } catch (Exception e) {
+ // 鍗曟潯鏄庣粏寮傚父鏃惰褰曞苟缁х画
+ log.error("鍑哄簱棰勮寮傚父 orderDetlId={} orderNo={} matnr={}", orderDetl.getId(), orderDetl.getOrderNo(), orderDetl.getMatnr(), e);
+ e.printStackTrace();
}
-
-
}
return R.ok().add(locDtoList);
@@ -138,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