From 1c0dbad152362ac704a27ecfc5b5d08247385d87 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 21 十月 2025 17:12:48 +0800
Subject: [PATCH] 13
---
src/main/java/com/zy/common/model/OutLocDto.java | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/common/model/OutLocDto.java b/src/main/java/com/zy/common/model/OutLocDto.java
index 3fc958d..d7f80b1 100644
--- a/src/main/java/com/zy/common/model/OutLocDto.java
+++ b/src/main/java/com/zy/common/model/OutLocDto.java
@@ -8,6 +8,7 @@
import com.zy.asrs.service.LocDetlService;
import lombok.Data;
+import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -19,38 +20,39 @@
private String locNo;
- private List<LocDetlDto> locDetlDtos;
+ private List<LocDetlDto> locDetlDtos = new ArrayList<>();
public OutLocDto() {
}
- public OutLocDto(String locNo, List<LocDetlDto> locDetlDtos) {
+ public OutLocDto(String locNo, LocDetlDto locDetlDto) {
this.locNo = locNo;
- this.locDetlDtos = locDetlDtos;
+ this.locDetlDtos.add(locDetlDto);
}
- public boolean isAll(){
+ public boolean isAll() {
+ List<LocDetlDto> locDetlDtosCp = new ArrayList<>(this.locDetlDtos);
// 鏌ヨ褰撳墠搴撲綅鍙锋墍鏈夌殑搴撳瓨鏄庣粏
LocDetlService locDetlService = SpringUtils.getBean(LocDetlService.class);
List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", this.locNo));
- if (locDetls == null || locDetls.isEmpty()){
+ if (locDetls == null || locDetls.isEmpty()) {
throw new CoolException("妫�绱㈠簱瀛樻槑缁嗗け璐ワ紝搴撲綅鍙�=" + this.locNo);
}
int sameNumber = 0;
for (LocDetl locDetl : locDetls) {
- Iterator<LocDetlDto> iterator = this.locDetlDtos.iterator();
+ Iterator<LocDetlDto> iterator = locDetlDtosCp.iterator();
while (iterator.hasNext()) {
- LocDetl next = iterator.next().getLocDetl();
- if (!next.getMatnr().equals(locDetl.getMatnr())) {
+ LocDetlDto next = iterator.next();
+ if (!next.getLocDetl().getMatnr().equals(locDetl.getMatnr())) {
continue;
}
- if (!Cools.eq(next.getBatch(), locDetl.getBatch())) {
+ if (!Cools.eq(next.getLocDetl().getBatch(), locDetl.getBatch())) {
continue;
}
- if (next.getAnfme() > locDetl.getAnfme()) {
+ if (next.getCount() > locDetl.getAnfme()) {
throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�");
}
- if (next.getAnfme().equals(locDetl.getAnfme())) {
+ if (next.getCount().equals(locDetl.getAnfme())) {
sameNumber++;
iterator.remove();
break;
--
Gitblit v1.9.1