From 82bcd0328dddbaad65933e2fada22bc68e82b3d5 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期六, 26 八月 2023 10:07:46 +0800
Subject: [PATCH] # 导入订单增加单据类型
---
src/main/java/com/zy/common/model/DetlDto.java | 46 +++++++++++++++++++++++-----------------------
1 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/zy/common/model/DetlDto.java b/src/main/java/com/zy/common/model/DetlDto.java
index e2e8bb3..1b936ad 100644
--- a/src/main/java/com/zy/common/model/DetlDto.java
+++ b/src/main/java/com/zy/common/model/DetlDto.java
@@ -21,6 +21,11 @@
private Double anfme;
+ private String memo;
+
+ private String cstmr;
+
+
public DetlDto() {
}
@@ -29,11 +34,17 @@
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;
@@ -41,6 +52,15 @@
this.batch = batch;
this.anfme = anfme;
}
+
+ public DetlDto(String matnr, String batch, Double anfme, String memo, String cstmr) {
+ this.matnr = matnr;
+ this.batch = batch;
+ this.anfme = anfme;
+ this.memo = memo;
+ this.cstmr = cstmr;
+ }
+
public static boolean hasList(Set<DetlDto> detlDtos, OrderDetl orderDetl) {
for (DetlDto dto : detlDtos) {
@@ -61,16 +81,8 @@
public static boolean has(List<DetlDto> detlDtos, DetlDto detlDto) {
for (DetlDto dto : detlDtos) {
- if (Cools.isEmpty(dto.getBatch()) && Cools.isEmpty(detlDto.getBatch())) {
- if (dto.getMatnr().equals(detlDto.getMatnr())) {
- return true;
- }
- } else {
- if (!Cools.isEmpty(dto.getBatch()) && !Cools.isEmpty(detlDto.getBatch())) {
- if (dto.getMatnr().equals(detlDto.getMatnr()) && dto.getBatch().equals(detlDto.getBatch())) {
- return true;
- }
- }
+ if (dto.getMatnr().equals(detlDto.getMatnr()) && Cools.eq(dto.getBatch(), detlDto.getBatch())) {
+ return true;
}
}
return false;
@@ -81,19 +93,7 @@
return null;
}
for (DetlDto detlDto : detlDtos) {
- if (!matnr.equals(detlDto.getMatnr())) {
- continue;
- }
- if (Cools.isEmpty(batch) && Cools.isEmpty(detlDto.getBatch())) {
- return detlDto;
- }
- if (Cools.isEmpty(batch) && !Cools.isEmpty(detlDto.getBatch())) {
- continue;
- }
- if (Cools.isEmpty(detlDto.getBatch()) && !Cools.isEmpty(batch)) {
- continue;
- }
- if (batch.equals(detlDto.getBatch())) {
+ if (matnr.equals(detlDto.getMatnr()) && Cools.eq(batch, detlDto.getBatch())) {
return detlDto;
}
}
--
Gitblit v1.9.1