From 08ae160eb43adaebc03e6e05e94575b9baad059c Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 13 八月 2025 11:10:45 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/common/model/TaskDto.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/common/model/TaskDto.java b/src/main/java/com/zy/common/model/TaskDto.java
index 4ba8064..2d3ab9c 100644
--- a/src/main/java/com/zy/common/model/TaskDto.java
+++ b/src/main/java/com/zy/common/model/TaskDto.java
@@ -6,6 +6,7 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.service.LocDetlService;
+import com.zy.asrs.utils.MatCompareUtils;
import lombok.Data;
import java.util.*;
@@ -71,13 +72,13 @@
// 姹囨�讳笉鑰冭檻搴忓垪鐮�
List<DetlDto> detlDtos = new ArrayList<>();
for (LocDto locDto : this.getLocDtos()) {
- DetlDto dto = new DetlDto(locDto.getMatnr(), locDto.getBatch(), locDto.getAnfme());
+ DetlDto dto = new DetlDto(locDto);
if (DetlDto.has(detlDtos, dto)) {
- DetlDto detlDto = DetlDto.find(detlDtos, locDto.getMatnr(), dto.getBatch());
+ DetlDto detlDto = DetlDto.find(detlDtos, locDto);
assert detlDto != null;
detlDto.setAnfme(detlDto.getAnfme() + locDto.getAnfme());
} else {
- detlDtos.add(new DetlDto(locDto.getMatnr(), locDto.getBatch(), locDto.getAnfme()));
+ detlDtos.add(new DetlDto(locDto));
}
}
@@ -106,6 +107,9 @@
continue;
}
}
+ if (!MatCompareUtils.compare(dto,locDetl)){
+ continue;
+ }
if (dto.getAnfme() > locDetl.getAnfme()) {
throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�");
}
--
Gitblit v1.9.1