From 0d30daf9ee89603b97c6181c2949abbb89bd64c4 Mon Sep 17 00:00:00 2001
From: tzsk <Administrator@qq.com>
Date: 星期四, 11 四月 2024 13:37:10 +0800
Subject: [PATCH] Merge branch 'tzskasrs-2' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-2
---
src/main/java/com/zy/common/model/OutLocDto.java | 84 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 79 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/common/model/OutLocDto.java b/src/main/java/com/zy/common/model/OutLocDto.java
index 810abac..3388eb6 100644
--- a/src/main/java/com/zy/common/model/OutLocDto.java
+++ b/src/main/java/com/zy/common/model/OutLocDto.java
@@ -40,17 +40,26 @@
for (LocDetl locDetl : locDetls) {
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(!Cools.eq(next.getLocDetl().getSuppCode(),locDetl.getSuppCode())){
+ continue;
+ }
+ if(!Cools.eq(next.getLocDetl().getThreeCode(),locDetl.getThreeCode())){
+ continue;
+ }
+ if(!Cools.eq(next.getLocDetl().getDeadTime(),locDetl.getDeadTime())){
+ continue;
+ }
+ if (next.getCount() > locDetl.getAnfme()) {
throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�");
}
- if (next.getAnfme().equals(locDetl.getAnfme())) {
+ if (next.getCount().equals(locDetl.getAnfme())) {
sameNumber++;
iterator.remove();
break;
@@ -60,4 +69,69 @@
return sameNumber == locDetls.size();
}
+ public void sortLocDetlDtos() {
+ ArrayList<LocDetlDto> list = new ArrayList<>();
+ EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
+ wrapper.eq("loc_no", locNo);
+ LocDetlService locDetlService = SpringUtils.getBean(LocDetlService.class);
+ List<LocDetl> locDetls = locDetlService.selectList(wrapper);
+ for (LocDetl locDetl : locDetls) {
+ boolean flag = true;
+ for (LocDetlDto locDetlDto : locDetlDtos) {
+ LocDetl detl = locDetlDto.getLocDetl();
+ if (!Cools.isEmpty(locDetl.getMatnr())) {
+ if (!locDetl.getMatnr().equals(detl.getMatnr())) {
+ continue;
+ }
+ }
+ if (!Cools.isEmpty(locDetl.getBatch())) {
+ if (!locDetl.getBatch().equals(detl.getBatch())) {
+ continue;
+ }
+ }
+ if (!Cools.isEmpty(locDetl.getSuppCode())) {
+ if (!locDetl.getSuppCode().equals(detl.getSuppCode())) {
+ continue;
+ }
+ }
+ flag = false;
+ break;
+ }
+
+ if (flag) {
+ LocDetlDto dto = new LocDetlDto(locDetl, 0D);
+ list.add(dto);
+ }
+ }
+
+ locDetlDtos.addAll(list);
+// ArrayList<String> matnr = new ArrayList<>();
+// ArrayList<String> batch = new ArrayList<>();
+// ArrayList<String> suppCode = new ArrayList<>();
+// for (LocDetlDto locDetlDto : locDetlDtos) {
+// LocDetl locDetl = locDetlDto.getLocDetl();
+// if (!Cools.isEmpty(locDetl.getMatnr())) {
+// matnr.add(locDetl.getMatnr());
+// }
+// if (!Cools.isEmpty(locDetl.getBatch())) {
+// batch.add(locDetl.getBatch());
+// }
+// if (!Cools.isEmpty(locDetl.getSuppCode())) {
+// suppCode.add(locDetl.getSuppCode());
+// }
+// }
+//
+// EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
+// wrapper.eq("loc_no", locNo);
+// wrapper.notIn("matnr", matnr);
+// wrapper.notIn("batch", batch);
+// wrapper.notIn("supp_code", suppCode);
+// LocDetlService locDetlService = SpringUtils.getBean(LocDetlService.class);
+// List<LocDetl> locDetls = locDetlService.selectList(wrapper);
+// for (LocDetl locDetl : locDetls) {
+// LocDetlDto dto = new LocDetlDto(locDetl, 0D);
+// locDetlDtos.add(dto);
+// }
+ }
+
}
--
Gitblit v1.9.1