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 | 57 ++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 48 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 0d2ba7d..fe78ee9 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -53,38 +53,75 @@
@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);
List<LocDto> locDtos = new ArrayList<>();
-
- 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.getQty()).orElse(0.0D);
- if (issued <= 0.0D) { continue; }
- List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist);
+ double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
+ if (issued <= 0.0D) {
+ continue;
+ }
+
+ // 浣跨敤鏂板澶氬瓧娈垫潯浠舵煡璇㈠簱瀛橈紙鍙敼鎴愪紶鍏ュ弬鏁版潵浼樺寲锛�
+ List<LocDetl> locDetls = locDetlService.queryStock(orderDetl); // 杩欎釜鏂规硶鍐呴儴搴旇鏍规嵁澶氫釜瀛楁鍖归厤
+
for (LocDetl locDetl : locDetls) {
+ // 澶氬瓧娈靛尮閰�
+ 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(),
+ 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);
- exist.add(locDetl.getLocNo());
- // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
+
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);
+ locDto.setModel(orderDetl.getModel());
+ locDto.setOutOrderNo(orderDetl.getOutOrderNo());
+ locDto.setLuHao(orderDetl.getLuHao());
+ 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);
}
@@ -110,7 +147,9 @@
List<TaskDto> taskDtos = new ArrayList<>();
// 鏍规嵁 锛堝簱浣� & 鍑哄簱绔欙級 鍒嗙粍锛� 鐞嗘兂鐘舵�侊細涓�缁勪负涓�娆″嚭搴撲换鍔�
for (LocDto locDto : locDtos) {
- if (locDto.isLack()) { continue; }
+ if (locDto.isLack()) {
+ continue;
+ }
TaskDto taskDto = new TaskDto(locDto.getLocNo(), locDto.getStaNo(), locDto);
if (TaskDto.has(taskDtos, taskDto)) {
TaskDto dto = TaskDto.find(taskDtos, taskDto);
--
Gitblit v1.9.1