From 4d910bae3ebb40e9ab0db6f9addb99636ce8de63 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期六, 21 九月 2024 08:09:41 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/OutController.java | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index ebb4acf..4678cea 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -78,7 +78,9 @@
}
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<>();
for (OrderDetl orderDetl : orderDetls) {
@@ -86,12 +88,8 @@
if (issued <= 0.0D) {
continue;
}
- List<LocDetl> locDetls;
- if (Cools.isEmpty(orderDetls.get(0).getSPgNO())) {
- locDetls = locDetlService.queryStockByModel(orderDetls.get(0).getModel());
- } else {
- locDetls = locDetlService.queryStock(orderDetls.get(0).getSPgNO());
- }
+ List<LocDetl> locDetls = locDetlService.queryStock(orderDetl);
+
for (LocDetl locDetl : locDetls) {
if (locDetl.getMatnr().equals(orderDetl.getMatnr())) {
if (issued > 0) {
@@ -99,8 +97,13 @@
issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued);
List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), issued >= locDetl.getAnfme() ? 101 : 103);
locDto.setStaNos(staNos);
- locDtos.add(locDto);
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();
@@ -113,6 +116,11 @@
LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
locDto.setLack(Boolean.TRUE);
locDto.setModel(orderDetl.getModel());
+ locDto.setOutOrderNo(orderDetl.getOutOrderNo());
+ locDto.setLuHao(orderDetl.getLuHao());
+ locDto.setPacking(orderDetl.getPacking());
+ locDto.setProType(orderDetl.getProType());
+ locDto.setSPgNO(orderDetl.getSPgNO());
locDtos.add(locDto);
}
}
--
Gitblit v1.9.1