From af212f68a20cfd2549a37093a7850b5a99f1a2ea Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期六, 21 九月 2024 09:39:19 +0800
Subject: [PATCH] 逻辑调整
---
src/main/java/com/zy/common/model/DetlDto.java | 82 +++++++++++++++++++++++-----------------
1 files changed, 47 insertions(+), 35 deletions(-)
diff --git a/src/main/java/com/zy/common/model/DetlDto.java b/src/main/java/com/zy/common/model/DetlDto.java
index 650e884..f416898 100644
--- a/src/main/java/com/zy/common/model/DetlDto.java
+++ b/src/main/java/com/zy/common/model/DetlDto.java
@@ -2,6 +2,8 @@
import com.core.common.Cools;
import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.entity.param.FullStoreParam;
+import com.zy.asrs.utils.MatCompareUtils;
import lombok.Data;
import java.util.List;
@@ -21,64 +23,74 @@
private Double anfme;
- public DetlDto() {
+ private String sPgNO;
+
+ private String outOrderNo;
+
+ private String luHao;
+
+ private String packing;
+
+ private String proType;
+
+
+ public DetlDto(LocDto locDto) {
+ this.matnr = locDto.getMatnr();
+ this.batch = locDto.getBatch();
+ this.sPgNO = locDto.getSPgNO();
+ this.outOrderNo = locDto.getOutOrderNo();
+ this.luHao = locDto.getLuHao();
+ this.packing = locDto.getPacking();
+ this.proType = locDto.getProType();
+ this.orderNo = locDto.getOrderNo();
+ this.anfme = locDto.getAnfme();
+
}
- public DetlDto(String matnr, Double anfme) {
- this.matnr = matnr;
- this.anfme = anfme;
- }
- public DetlDto(String matnr, String batch) {
- this.matnr = matnr;
- this.batch = batch;
- }
- public DetlDto(String matnr, String batch, Double anfme) {
- this.matnr = matnr;
- this.batch = batch;
- this.anfme = anfme;
- }
-
- public DetlDto(String orderNo, String matnr, String batch, Double anfme) {
- this.orderNo = orderNo;
- this.matnr = matnr;
- this.batch = batch;
- this.anfme = anfme;
- }
public static boolean hasList(Set<DetlDto> detlDtos, OrderDetl orderDetl) {
for (DetlDto dto : detlDtos) {
- if (Cools.isEmpty(dto.getBatch()) && Cools.isEmpty(orderDetl.getBatch())) {
- if (dto.getMatnr().equals(orderDetl.getMatnr())) {
- return true;
- }
- } else {
- if (!Cools.isEmpty(dto.getBatch()) && !Cools.isEmpty(orderDetl.getBatch())) {
- if (dto.getMatnr().equals(orderDetl.getMatnr()) && dto.getBatch().equals(orderDetl.getBatch())) {
- return true;
- }
- }
+ boolean compare = MatCompareUtils.compare(dto, orderDetl);
+ if (compare) {
+ return true;
}
+// if (Cools.isEmpty(dto.getBatch()) && Cools.isEmpty(orderDetl.getBatch())) {
+// if (dto.getMatnr().equals(orderDetl.getMatnr())) {
+// return true;
+// }
+// } else {
+// if (!Cools.isEmpty(dto.getBatch()) && !Cools.isEmpty(orderDetl.getBatch())) {
+// if (dto.getMatnr().equals(orderDetl.getMatnr()) && dto.getBatch().equals(orderDetl.getBatch())) {
+// return true;
+// }
+// }
+// }
}
return false;
}
public static boolean has(List<DetlDto> detlDtos, DetlDto detlDto) {
for (DetlDto dto : detlDtos) {
- if (dto.getMatnr().equals(detlDto.getMatnr()) && Cools.eq(dto.getBatch(), detlDto.getBatch())) {
+ boolean compare = MatCompareUtils.compare(dto, detlDto);
+ if (compare) {
return true;
}
+// if (dto.getMatnr().equals(detlDto.getMatnr()) && Cools.eq(dto.getBatch(), detlDto.getBatch())) {
+// return true;
+// }
}
return false;
}
- public static DetlDto find(List<DetlDto> detlDtos, String matnr, String batch) {
- if (Cools.isEmpty(matnr)) {
+ public static DetlDto find(List<DetlDto> detlDtos, LocDto locDto) {
+ if (Cools.isEmpty(locDto)) {
return null;
}
for (DetlDto detlDto : detlDtos) {
- if (matnr.equals(detlDto.getMatnr()) && Cools.eq(batch, detlDto.getBatch())) {
+ boolean compare = MatCompareUtils.compare(detlDto, locDto);
+ if (compare) {
return detlDto;
}
}
--
Gitblit v1.9.1