From fcd35daf35247eb3c0b087f2042de1fd9013b5b6 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 06 八月 2025 14:27:50 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/common/model/DetlDto.java | 5 ++++-
1 files changed, 4 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 5e5093e..c5c6d17 100644
--- a/src/main/java/com/zy/common/model/DetlDto.java
+++ b/src/main/java/com/zy/common/model/DetlDto.java
@@ -41,6 +41,8 @@
//閫�搴撶粍鎵�
private String tkFlag;
+ //搴撳瓨鐘舵��
+ private String cstateid;
public DetlDto() {
}
@@ -271,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