From 42e67d1c26c101cf35353f6ce248f2b57535a74b Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期五, 13 六月 2025 22:19:49 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/model/DetlDto.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/common/model/DetlDto.java b/src/main/java/com/zy/common/model/DetlDto.java
index c13a6ad..5e5093e 100644
--- a/src/main/java/com/zy/common/model/DetlDto.java
+++ b/src/main/java/com/zy/common/model/DetlDto.java
@@ -21,6 +21,7 @@
private String remark;
+
private String batch = "";
private String brand = "";
private String standby1 = "";
@@ -34,6 +35,12 @@
private String boxType3 = "";
private Double anfme;
+
+ private Double weight;
+
+ //閫�搴撶粍鎵�
+ private String tkFlag;
+
public DetlDto() {
}
@@ -203,7 +210,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;
--
Gitblit v1.9.1