From 2e01263a1d3db25eb947c38c3cf0702cb64bb07f Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期三, 21 五月 2025 16:43:03 +0800
Subject: [PATCH] #页面更改
---
src/main/java/com/zy/common/model/TaskDto.java | 118 +++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 83 insertions(+), 35 deletions(-)
diff --git a/src/main/java/com/zy/common/model/TaskDto.java b/src/main/java/com/zy/common/model/TaskDto.java
index afcf9d0..0c467ff 100644
--- a/src/main/java/com/zy/common/model/TaskDto.java
+++ b/src/main/java/com/zy/common/model/TaskDto.java
@@ -8,10 +8,7 @@
import com.zy.asrs.service.LocDetlService;
import lombok.Data;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
/**
* Created by vincent on 2022/3/28
@@ -22,6 +19,7 @@
private String locNo;
private Integer staNo;
+ private List<LocDetlDto> locDetlDtos = new ArrayList<>();
private List<LocDto> locDtos;
@@ -70,37 +68,87 @@
return null;
}
- public boolean isAll(){
- // 姹囨�讳笉鑰冭檻鎵瑰彿
- List<DetlDto> detlDtos = new ArrayList<>();
- for (LocDto locDto : this.getLocDtos()) {
- DetlDto dto = new DetlDto(locDto.getMatnr(), null, locDto.getAnfme());
- if (DetlDto.has(detlDtos, dto)) {
- DetlDto detlDto = DetlDto.find(detlDtos, locDto.getMatnr(), null);
- assert detlDto != null;
- detlDto.setAnfme(detlDto.getAnfme() + locDto.getAnfme());
- } else {
- detlDtos.add(new DetlDto(locDto.getMatnr(), null, locDto.getAnfme()));
- }
- }
-
- // 鏌ヨ褰撳墠搴撲綅鍙锋墍鏈夌殑搴撳瓨鏄庣粏
- LocDetlService locDetlService = SpringUtils.getBean(LocDetlService.class);
- // todo
- List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", this.locNo));
- if (locDetls == null || locDetls.isEmpty()){
- throw new CoolException("璁＄畻婊℃澘澶辫触锛屽簱浣嶅彿=" + this.locNo);
- }
- int sameNumber = 0;
- for (LocDetl locDetl : locDetls) {
- for (DetlDto detlDto : detlDtos) {
- if (detlDto.getLocDetl().getMatnr().equals(locDetl.getMatnr()) && dto.getCount().equals(locDetl.getAnfme())) {
- sameNumber++;
- break;
- }
- }
- }
- return sameNumber == locDetls.size();
+// public boolean isAll(){
+// // 姹囨�讳笉鑰冭檻搴忓垪鐮�
+// List<DetlDto> detlDtos = new ArrayList<>();
+// for (LocDto locDto : this.getLocDtos()) {
+// DetlDto dto = new DetlDto(locDto);
+// if (DetlDto.has(detlDtos, dto)) {
+// DetlDto detlDto = DetlDto.find(detlDtos, locDto);
+// assert detlDto != null;
+// detlDto.setAnfme(detlDto.getAnfme() + locDto.getAnfme());
+// } else {
+// detlDtos.add(new DetlDto(locDto));
+// }
+// }
+//
+// // 鏌ヨ褰撳墠搴撲綅鍙锋墍鏈夌殑搴撳瓨鏄庣粏
+// LocDetlService locDetlService = SpringUtils.getBean(LocDetlService.class);
+// List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", this.locNo));
+// if (locDetls == null || locDetls.isEmpty()){
+// throw new CoolException("妫�绱㈠簱瀛樻槑缁嗗け璐ワ紝搴撲綅鍙�=" + this.locNo);
+// }
+// int sameNumber = 0;
+// for (LocDetl locDetl : locDetls) {
+// Iterator<DetlDto> iterator = detlDtos.iterator();
+// while (iterator.hasNext()) {
+// DetlDto dto = iterator.next();
+// if (!dto.getMatnr().equals(locDetl.getMatnr())) {
+// continue;
+// }
+// if (Cools.isEmpty(dto.getBatch()) && !Cools.isEmpty(locDetl.getBatch())) {
+// continue;
+// }
+// if (!Cools.isEmpty(dto.getBatch()) && Cools.isEmpty(locDetl.getBatch())) {
+// continue;
+// }
+// if (!Cools.isEmpty(dto.getBatch()) && !Cools.isEmpty(locDetl.getBatch())) {
+// if (!dto.getBatch().equals(locDetl.getBatch())) {
+// continue;
+// }
+// }
+// if (dto.getAnfme() > locDetl.getAnfme()) {
+// throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�");
+// }
+// if (dto.getAnfme().equals(locDetl.getAnfme())) {
+// sameNumber++;
+// iterator.remove();
+// break;
+// }
+// }
+// }
+// return sameNumber == locDetls.size();
+// }
+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()){
+ throw new CoolException("妫�绱㈠簱瀛樻槑缁嗗け璐ワ紝搴撲綅鍙�=" + this.locNo);
}
+ int sameNumber = 0;
+ for (LocDetl locDetl : locDetls) {
+ Iterator<LocDetlDto> iterator = locDetlDtosCp.iterator();
+ while (iterator.hasNext()) {
+ LocDetlDto next = iterator.next();
+ if (!next.getLocDetl().getMatnr().equals(locDetl.getMatnr())) {
+ continue;
+ }
+ if (!Cools.eq(next.getLocDetl().getBatch(), locDetl.getBatch())) {
+ continue;
+ }
+ if (next.getCount() > locDetl.getAnfme()) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�");
+ }
+ if (next.getCount().equals(locDetl.getAnfme())) {
+ sameNumber++;
+ iterator.remove();
+ break;
+ }
+ }
+ }
+ return sameNumber == locDetls.size();
+}
}
--
Gitblit v1.9.1