From d4dd0fc25defe6d7dc683b1f428bbfa12bb5fc16 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期四, 08 一月 2026 14:07:13 +0800
Subject: [PATCH] 出库单预览获取工作站点
---
src/main/java/com/zy/asrs/controller/OutController.java | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 60b2dec..8690895 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -5,8 +5,11 @@
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
+import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
+import com.zy.asrs.service.impl.BasDeviceServiceImpl;
+import com.zy.asrs.service.impl.LocAroundBindServiceImpl;
import com.zy.common.model.LocDto;
import com.zy.common.model.TaskDto;
import com.zy.common.web.BaseController;
@@ -46,6 +49,10 @@
@Resource
private OrderPakoutService orderPakOutService;
+ @Autowired
+ private BasDeviceService basDeviceService;
+ @Autowired
+ private LocAroundBindService locAroundBindService;
@PostMapping("/out/pakout/orderDetlIds/auth")
@@ -68,7 +75,6 @@
}
List<LocDto> locDtos = new ArrayList<>();
-
Set<String> exist = new HashSet<>();
// 鑾峰彇璁㈠崟涓昏〃
@@ -80,6 +86,23 @@
if (issued <= 0.0D) {
continue;
}
+ if (Objects.isNull(orderDetl.getStandby1())) {
+ throw new CoolException("鍙版満鍙蜂笉鑳戒负绌猴紒锛�");
+ }
+ BasDevice basDevice = basDeviceService.selectOne(new EntityWrapper<BasDevice>().eq("dev_no", orderDetl.getStandby1()));
+ if (Objects.isNull(basDevice)) {
+ throw new CoolException("鍙版満淇℃伅涓嶅瓨鍦紒锛�");
+ }
+
+ List<LocAroundBind> binds = locAroundBindService.selectList(new EntityWrapper<LocAroundBind>().eq("dev_no", basDevice.getDevNo()));
+ if (Objects.isNull(binds) || binds.isEmpty()) {
+ throw new CoolException("鍙版満鏈粦瀹氬伐浣滅珯鍙帮紒锛�");
+ }
+
+
+
+
+
List<LocDetl> locDetls = locDetlService.queryStockAll(null, exist,orderDetl.getMatnr(), orderDetl.getBatch(),
orderDetl.getBrand(),orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3());
for (LocDetl locDetl : locDetls) {
@@ -97,7 +120,6 @@
locDto.setBoxType1(orderDetl.getBoxType1());
locDto.setBoxType2(orderDetl.getBoxType2());
locDto.setBoxType3(orderDetl.getBoxType3());
-
locDto.setStaNos(staNos);
locDtos.add(locDto);
// 鍓╀綑寰呭嚭鏁伴噺閫掑噺
@@ -109,7 +131,6 @@
if (issued > 0) {
LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
locDto.setBrand(orderDetl.getBrand());
-
locDto.setStandby1(orderDetl.getStandby1());
locDto.setStandby2(orderDetl.getStandby2());
locDto.setStandby3(orderDetl.getStandby3());
--
Gitblit v1.9.1