From e9e62abb618d334d6999102ec20c49d38df587e6 Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期三, 15 十月 2025 13:10:48 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OutController.java | 17 ++++++++++++++++-
1 files changed, 16 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 a7004eb..844fe80 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -11,6 +11,7 @@
import com.zy.common.model.LocDto;
import com.zy.common.model.TaskDto;
import com.zy.common.web.BaseController;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -25,6 +26,7 @@
*/
@RestController
+@Slf4j
public class OutController extends BaseController {
@Autowired
@@ -61,18 +63,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; }
+ 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);
+// 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);
@@ -132,6 +146,7 @@
}
}
// -----------------------------------------------------------------------------------------------
+ log.info("鍑哄簱鍒嗙粍鏁版嵁锛歿}",taskDtos);
for (TaskDto taskDto : taskDtos) {
BasDevp staNo = basDevpService.checkSiteStatus(taskDto.getStaNo());
workService.stockOut(staNo, taskDto, getUserId());
--
Gitblit v1.9.1