From aa61aad410dba7922a248d43898105eb8e12de96 Mon Sep 17 00:00:00 2001
From: ytfl <ytfl@qq.com>
Date: 星期六, 16 八月 2025 11:04:24 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/model/DetlDto.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/common/model/DetlDto.java b/src/main/java/com/zy/common/model/DetlDto.java
index 9e49ea2..c5c6d17 100644
--- a/src/main/java/com/zy/common/model/DetlDto.java
+++ b/src/main/java/com/zy/common/model/DetlDto.java
@@ -19,6 +19,9 @@
private String matnr;
+ private String remark;
+
+
private String batch = "";
private String brand = "";
private String standby1 = "";
@@ -32,6 +35,14 @@
private String boxType3 = "";
private Double anfme;
+
+ private Double weight;
+
+ //閫�搴撶粍鎵�
+ private String tkFlag;
+
+ //搴撳瓨鐘舵��
+ private String cstateid;
public DetlDto() {
}
@@ -201,7 +212,9 @@
&& Cools.eq(dto.getStandby2(), detlDto.getStandby2()) && Cools.eq(dto.getStandby3(), detlDto.getStandby3())
&& Cools.eq(dto.getBoxType1(), detlDto.getBoxType1()) && Cools.eq(dto.getBoxType2(), detlDto.getBoxType2())
&& Cools.eq(dto.getBoxType3(), detlDto.getBoxType3())) {
- return true;
+ if (dto.getOrderNo().equals(detlDto.getOrderNo())){
+ return true;
+ }
}
}
return false;
@@ -260,7 +273,8 @@
}
for (DetlDto detlDto : detlDtos) {
if (detlDtoB.getMatnr().equals(detlDto.getMatnr()) && Cools.eq(detlDtoB.getBatch(), detlDto.getBatch())
- && detlDtoB.getBrand().equals(detlDto.getBrand()) && detlDtoB.getStandby1().equals(detlDto.getStandby1())
+// && detlDtoB.getBrand().equals(detlDto.getBrand())
+ && detlDtoB.getStandby1().equals(detlDto.getStandby1())
&& detlDtoB.getStandby2().equals(detlDto.getStandby2()) && detlDtoB.getStandby3().equals(detlDto.getStandby3())
&& detlDtoB.getBoxType1().equals(detlDto.getBoxType1()) && detlDtoB.getBoxType2().equals(detlDto.getBoxType2())
&& detlDtoB.getBoxType3().equals(detlDto.getBoxType3())) {
--
Gitblit v1.9.1