From 19b6160823c407902c9f93bc6b9c75a851b0036d Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 07 一月 2025 09:18:50 +0800
Subject: [PATCH] 添加入库人员字段及关联用户信息
---
src/main/java/com/zy/asrs/controller/OutController.java | 20 +++++++++++++++++++-
1 files changed, 19 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 d0b363b..eabc3e3 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -61,12 +61,30 @@
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; }
- List<LocDetl> 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 {
+ // locDetls = locDetlService.queryStockByBomcode(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getBomCode(),null, exist);
+ //}
+// locDetls = locDetlService.queryStockByBomcode(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getBomCode(),null, exist);
for (LocDetl locDetl : locDetls) {
+ if (exist2.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