From 319735dede5ac3febb1840455ba0406227bc966f Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 23 十月 2024 15:55:46 +0800
Subject: [PATCH] 合并订单出库
---
src/main/java/com/zy/asrs/controller/OutController.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 77ef408..cf9d835 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -61,11 +61,13 @@
Set<String> exist = new HashSet<>();
+ Set<String> exist2 = new HashSet<>();
+
for (OrderDetl orderDetl : orderDetls) {
List<LocDetl> locDetls = new ArrayList<>();
double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
if (issued <= 0.0D) { continue; }
- locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist);
+ locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist2);
//if (Cools.isEmpty(orderDetl.getBomCode())) {
// locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist);
//} else {
@@ -73,7 +75,16 @@
//}
// locDetls = locDetlService.queryStockByBomcode(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getBomCode(),null, exist);
for (LocDetl locDetl : locDetls) {
+ if (exist.contains(locDetl.getLocNo())) {
+ for (LocDto locDto : locDtos) {
+ if(Cools.isEmpty(locDto.getLocNo())) { continue; }
+ if (locDto.getLocNo().equals(locDetl.getLocNo())) {
+ locDetl.setAnfme(locDetl.getAnfme() - locDto.getAnfme());
+ }
+ }
+ }
if (issued > 0) {
+ if (locDetl.getAnfme() <= 0) break;
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);
--
Gitblit v1.9.1