From 86a4b29c606c50d63e3cdddbac2b6e031d8ed2dc Mon Sep 17 00:00:00 2001 From: mashuai Date: Fri, 17 Oct 2025 12:03:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../clz/service/impl/MaterialMachineServiceImpl.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialMachineServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialMachineServiceImpl.java index 179a5f81..f6e44953 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialMachineServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialMachineServiceImpl.java @@ -277,13 +277,11 @@ public class MaterialMachineServiceImpl implements MaterialMachineService { } else { list = materialMachineMapper.getMaCodeList(bean); List useList = materialMachineMapper.getMaCodeDetails(bean); - if ("0".equals(bean.getManageType())) { - if (CollectionUtils.isNotEmpty(list) && CollectionUtils.isNotEmpty(useList)) { - // 将list中存在于useList中的元素过滤处理 - list = list.stream() - .filter(item -> useList.stream().noneMatch(useItem -> useItem.getMaId().equals(item.getMaId()))) - .collect(Collectors.toList()); - } + if (CollectionUtils.isNotEmpty(list) && CollectionUtils.isNotEmpty(useList)) { + // 将list中存在于useList中的元素过滤处理 + list = list.stream() + .filter(item -> useList.stream().noneMatch(useItem -> useItem.getMaId().equals(item.getMaId()))) + .collect(Collectors.toList()); } for (MaterialStorageInfo useStorageInfo : list) { // 查询出库信息