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 | 111 +++++++++++++++++++++++++++++++------------------------
1 files changed, 63 insertions(+), 48 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 3edf6e9..7bb2e66 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -13,6 +13,7 @@
import com.zy.common.model.OrderMergeVo;
import com.zy.common.model.TaskDto;
import com.zy.common.web.BaseController;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -23,7 +24,7 @@
/**
* Created by vincent on 2022/3/26
*/
-
+@Slf4j
@RestController
public class OutController extends BaseController {
@@ -76,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);
@@ -115,8 +120,8 @@
@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;
for (LocDto locDto : locDtos) {
@@ -137,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();
}
@@ -163,7 +176,9 @@
@RequestMapping(value = "/order/merge/preview/auth")
@ManagerAuth
public R mergePreview(@RequestParam(value = "orderIds[]") List<Long> orderIds){
- return R.ok().add(orderService.mergePreview(orderIds));
+ List<OrderMergeVo> orderMergeVos = orderService.mergePreview(orderIds);
+ log.info("鍚堝苟鍑哄簱姹囨�籰ocDtoList:{}", orderMergeVos);
+ return R.ok().add(orderMergeVos);
}
@PostMapping("/out/pakout/preview/merge/auth")
@@ -190,7 +205,7 @@
}
}
-
+ log.info("鍚堝苟鍑哄簱棰勮locDtoList:{}", locDtoList);
return R.ok().add(locDtoList);
}
--
Gitblit v1.9.1