From 8fd4c2cfc08002ca63ad79c89ab4e30cd16b8d30 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 29 九月 2025 09:27:16 +0800
Subject: [PATCH] 对接
---
src/main/java/com/zy/asrs/controller/OutController.java | 13 +++++--------
1 files changed, 5 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 2ff8fd7..820b5fd 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -146,14 +146,10 @@
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.queryStockAll(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist);
for (LocDetl locDetl : locDetls) {
- LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
- issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued);
+ LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(), locDetl.getAnfme());
List<String> staNos = new ArrayList<>();
staNos.add("C1");
staNos.add("C2");
@@ -166,7 +162,7 @@
return R.ok().add(locDtos);
}
- @PostMapping("/out/pakoutV2/auth")
+ @PostMapping("/out/pakout2/auth")
@ManagerAuth(memo = "璁㈠崟鍑哄簱")
public synchronized R pakout2(@RequestBody List<LocDto> locDtos) throws InterruptedException {
if (Cools.isEmpty(locDtos)) {
@@ -185,6 +181,7 @@
Thread.sleep(1000L);
+
List<TaskDto> taskDtos = new ArrayList<>();
// 鏍规嵁 锛堝簱浣� & 鍑哄簱绔欙級 鍒嗙粍锛� 鐞嗘兂鐘舵�侊細涓�缁勪负涓�娆″嚭搴撲换鍔�
for (LocDto locDto : locDtos) {
@@ -202,7 +199,7 @@
}
// -----------------------------------------------------------------------------------------------
for (TaskDto taskDto : taskDtos) {
- workService.stockOut(null, taskDto, getUser(), taskDto.getStaNo());
+ workService.stockOutCheckAnfme(null, taskDto, getUser(), taskDto.getStaNo());
}
return R.ok();
}
--
Gitblit v1.9.1