From a40a3dca702ef90f32a321fba8cdac33851c6b83 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 10 二月 2025 14:51:56 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/model/ExistDto.java | 9 +++++++++
src/main/java/com/zy/asrs/controller/OutController.java | 9 +++++++--
2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index ff2ba02..c40cac8 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -13,6 +13,7 @@
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.Utils;
+import com.zy.common.model.ExistDto;
import com.zy.common.model.LocDto;
import com.zy.common.model.TaskDto;
import com.zy.common.utils.OutStockInterceptUtil;
@@ -118,6 +119,7 @@
List<LocDto> locDtos = new ArrayList<>();
Set<String> exist = new HashSet<>();
+ Set<ExistDto> existDtos = new HashSet<>();
for (OrderDetl orderDetl : orderDetls) {
double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
@@ -152,6 +154,10 @@
.eq("loc_No", locMast1.getLocNo())
.eq("matnr", locDetl.getMatnr()).eq("batch", locDetl.getBatch()));
if (!Cools.isEmpty(locDetl1)) {
+ ExistDto existDto = new ExistDto();
+ existDto.setLocNo(locDetl.getLocNo());
+ existDto.setMatnr(locDetl.getMatnr());
+ if (existDtos.add(existDto)){
if (issued > 0) {
LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued);
@@ -170,8 +176,7 @@
}else {
break;
}
-
-
+ }
}
}
}
diff --git a/src/main/java/com/zy/common/model/ExistDto.java b/src/main/java/com/zy/common/model/ExistDto.java
new file mode 100644
index 0000000..70e6724
--- /dev/null
+++ b/src/main/java/com/zy/common/model/ExistDto.java
@@ -0,0 +1,9 @@
+package com.zy.common.model;
+
+import lombok.Data;
+
+@Data
+public class ExistDto {
+ private String locNo;
+ private String matnr;
+}
--
Gitblit v1.9.1