From b67bafd95dc17136ac0eab068ba51cd55e1669f3 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期五, 13 六月 2025 20:08:12 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/common/model/DetlDto.java |   13 ++++++++++++-
 1 files changed, 12 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 9e49ea2..5e5093e 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,12 @@
     private String boxType3 = "";
 
     private Double anfme;
+
+    private Double weight;
+
+    //閫�搴撶粍鎵�
+    private String tkFlag;
+
 
     public DetlDto() {
     }
@@ -201,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