From 1c0dbad152362ac704a27ecfc5b5d08247385d87 Mon Sep 17 00:00:00 2001 From: zhang <zc857179121@qq.com> Date: 星期二, 21 十月 2025 17:12:48 +0800 Subject: [PATCH] 13 --- src/main/java/com/zy/common/model/DetlDto.java | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/zy/common/model/DetlDto.java b/src/main/java/com/zy/common/model/DetlDto.java index 4bb2e42..a952d6b 100644 --- a/src/main/java/com/zy/common/model/DetlDto.java +++ b/src/main/java/com/zy/common/model/DetlDto.java @@ -1,7 +1,7 @@ package com.zy.common.model; import com.core.common.Cools; -import com.zy.asrs.entity.OrderDetl; +import com.zy.asrs.entity.OrderDetlPakout; import lombok.Data; import java.util.List; @@ -81,15 +81,15 @@ this.anfme = anfme; } - public static boolean hasList(Set<DetlDto> detlDtos, OrderDetl orderDetl) { + public static boolean hasList(Set<DetlDto> detlDtos, OrderDetlPakout orderDetlPakout) { for (DetlDto dto : detlDtos) { - if (Cools.isEmpty(dto.getBatch()) && Cools.isEmpty(orderDetl.getBatch())) { - if (dto.getMatnr().equals(orderDetl.getMatnr())) { + if (Cools.isEmpty(dto.getBatch()) && Cools.isEmpty(orderDetlPakout.getBatch())) { + if (dto.getMatnr().equals(orderDetlPakout.getMatnr())) { return true; } } else { - if (!Cools.isEmpty(dto.getBatch()) && !Cools.isEmpty(orderDetl.getBatch())) { - if (dto.getMatnr().equals(orderDetl.getMatnr()) && dto.getBatch().equals(orderDetl.getBatch())) { + if (!Cools.isEmpty(dto.getBatch()) && !Cools.isEmpty(orderDetlPakout.getBatch())) { + if (dto.getMatnr().equals(orderDetlPakout.getMatnr()) && dto.getBatch().equals(orderDetlPakout.getBatch())) { return true; } } -- Gitblit v1.9.1