From 57312d914cd21a96c17a69beb6cac581e00100a9 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期六, 26 七月 2025 09:13:12 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OutController.java | 84 ++++++++++++++++++++---------------------
1 files changed, 41 insertions(+), 43 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 4678cea..fe78ee9 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -53,65 +53,60 @@
@PostMapping("/out/pakout/preview/auth")
@ManagerAuth
public R pakoutPreview(@RequestBody List<Long> ids) {
-// if (Cools.isEmpty(ids)) {
-// return R.parse(BaseRes.PARAM);
-// }
-// List<OrderDetl> orderDetls = orderDetlService.selectBatchIds(ids);
-// //鐢ㄦ埛纭鍑哄叆搴撻兘浠gno涓哄噯锛岄偅涔堜笉鑰冭檻鏁伴噺浜�
-// List<LocDto> locDtos = new ArrayList<>();
-// if (orderDetls != null && !orderDetls.isEmpty()) {
-// List<LocDetl> locDetls = locDetlService.queryStock(orderDetls.get(0).getSPgNO());
-// for (LocDetl locDetl : locDetls) {
-// LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetls.get(0).getOrderNo(),
-// locDetl.getAnfme());
-// List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), 101);
-// locDto.setStaNos(staNos);
-// locDto.setZpallet(locDetl.getZpallet());
-// locDto.setSPgNO(orderDetls.get(0).getSPgNO());
-// locDtos.add(locDto);
-// }
-// }
-// return R.ok().add(locDtos);
+
if (Cools.isEmpty(ids)) {
return R.parse(BaseRes.PARAM);
}
List<OrderDetl> orderDetls = orderDetlService.selectBatchIds(ids);
List<LocDto> locDtos = new ArrayList<>();
- orderDetls = orderDetls.stream()
- .sorted(Comparator.comparing(OrderDetl::getMatnr).thenComparing(OrderDetl::getBatch))
- .collect(Collectors.toList());
- Set<String> exist = new HashSet<>();
+// orderDetls = orderDetls.stream()
+// .sorted(Comparator.comparing(OrderDetl::getMatnr).thenComparing(OrderDetl::getBatch))
+// .collect(Collectors.toList());
+// Set<String> exist = new HashSet<>();
for (OrderDetl orderDetl : orderDetls) {
double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
if (issued <= 0.0D) {
continue;
}
- List<LocDetl> locDetls = locDetlService.queryStock(orderDetl);
+
+ // 浣跨敤鏂板澶氬瓧娈垫潯浠舵煡璇㈠簱瀛橈紙鍙敼鎴愪紶鍏ュ弬鏁版潵浼樺寲锛�
+ List<LocDetl> locDetls = locDetlService.queryStock(orderDetl); // 杩欎釜鏂规硶鍐呴儴搴旇鏍规嵁澶氫釜瀛楁鍖归厤
for (LocDetl locDetl : locDetls) {
- if (locDetl.getMatnr().equals(orderDetl.getMatnr())) {
- if (issued > 0) {
- LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
- issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued);
- List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), issued >= locDetl.getAnfme() ? 101 : 103);
- locDto.setStaNos(staNos);
- locDto.setModel(locDetl.getModel());
- locDto.setOutOrderNo(locDetl.getOutOrderNo());
- locDto.setLuHao(locDetl.getLuHao());
- locDto.setPacking(locDetl.getPacking());
- locDto.setProType(locDetl.getProType());
- locDto.setSPgNO(locDetl.getSPgNO());
- locDtos.add(locDto);
- exist.add(locDetl.getLocNo());
- // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
- issued = issued - locDetl.getAnfme();
- } else {
- break;
- }
+ // 澶氬瓧娈靛尮閰�
+ boolean match = locDetl.getMatnr().equals(orderDetl.getMatnr())
+ && Objects.equals(locDetl.getOutOrderNo(), orderDetl.getOutOrderNo())
+ && Objects.equals(locDetl.getTemp2(), orderDetl.getTemp2())
+ && Objects.equals(locDetl.getProType(), orderDetl.getProType())
+ && Objects.equals(locDetl.getModel(), orderDetl.getModel())
+ && Objects.equals(locDetl.getLuHao(), orderDetl.getLuHao());
+
+ if (!match) continue;
+
+ if (issued > 0) {
+ LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(),
+ locDetl.getBatch(), orderDetl.getOrderNo(),
+ issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued);
+ List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), issued >= locDetl.getAnfme() ? 101 : 103);
+ locDto.setStaNos(staNos);
+ locDto.setModel(locDetl.getModel());
+ locDto.setOutOrderNo(locDetl.getOutOrderNo());
+ locDto.setLuHao(locDetl.getLuHao());
+ locDto.setPacking(locDetl.getPacking());
+ locDto.setProType(locDetl.getProType());
+ locDto.setSPgNO(locDetl.getSPgNO());
+ locDto.setColor(locDetl.getColor());
+ locDto.setTemp2(locDetl.getTemp2()); // 鏂板瀛楁
+ locDtos.add(locDto);
+
+ issued = issued - locDetl.getAnfme();
+ } else {
+ break;
}
}
+
if (issued > 0) {
LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
locDto.setLack(Boolean.TRUE);
@@ -121,9 +116,12 @@
locDto.setPacking(orderDetl.getPacking());
locDto.setProType(orderDetl.getProType());
locDto.setSPgNO(orderDetl.getSPgNO());
+ locDto.setColor(orderDetl.getColor());
+ locDto.setTemp2(orderDetl.getTemp2());
locDtos.add(locDto);
}
}
+
return R.ok().add(locDtos);
}
--
Gitblit v1.9.1