bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
hongchao 2025-10-17 12:11:43 +08:00
parent f5cf9fced2 86a4b29c60
commit 09a9ac8cef
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialMachineServiceImpl.java
View File

@ -277,14 +277,12 @@ public class MaterialMachineServiceImpl implements MaterialMachineService {
} else {
list = materialMachineMapper.getMaCodeList(bean);
List<MaterialStorageInfo> 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());
}
}
for (MaterialStorageInfo useStorageInfo : list) {
// 查询出库信息
if (useStorageInfo.getLeaseId() != null) {