From 3bb4318838b873e346f125659e9a1f531f92d70a Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 03 九月 2025 17:16:40 +0800
Subject: [PATCH] 许可证有效期”改成“仓储系统许可有效期
---
src/main/java/com/zy/common/model/DetlDto.java | 87 +++++++++++++++++++++++++++++++------------
1 files changed, 63 insertions(+), 24 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..8890207 100644
--- a/src/main/java/com/zy/common/model/DetlDto.java
+++ b/src/main/java/com/zy/common/model/DetlDto.java
@@ -13,13 +13,60 @@
@Data
public class DetlDto {
- private String orderNo;
+ /**
+ * 1锛氭甯� 0锛氬叧闂�
+ */
+ private Integer sts;
+ /**
+ * 琛屽彿
+ */
+ private String model;
+
+ /**
+ * 鐗╂枡缂栫爜
+ */
private String matnr;
+ /**
+ * 鐗╂枡缂栫爜
+ */
+ private String maktx;
+
+ /**
+ * 鐗规畩璇存槑
+ */
private String batch;
+ /**
+ * 瀹屾垚鏁伴噺
+ */
private Double anfme;
+
+ /**
+ * 瑙勬牸
+ */
+ private String specs;
+
+ /**
+ * 绔嬪簱婧愯揣浣嶏紙榛樿1-1锛�
+ */
+ private String sourceStaNo = "1-1";
+
+ /**
+ * 鐩爣璐т綅
+ */
+ private String locNo = "2-2";
+
+ /**
+ * 琛屼富閿�
+ */
+ private String memo;
+
+ private String orderNo;
+
+
+ private Double units;
public DetlDto() {
}
@@ -29,10 +76,22 @@
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 matnr, String batch, Double anfme, Double units) {
+ this.matnr = matnr;
+ this.batch = batch;
+ this.anfme = anfme;
+ this.units = units;
}
public DetlDto(String orderNo, String matnr, String batch, Double anfme) {
@@ -61,16 +120,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 +132,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