This commit is contained in:
parent
2c4aa45c82
commit
b2d7d082f0
|
|
@ -227,6 +227,13 @@ public class MaterialMachineServiceImpl implements MaterialMachineService {
|
||||||
list = materialMachineMapper.getMaCodeDetails(bean);
|
list = materialMachineMapper.getMaCodeDetails(bean);
|
||||||
} else {
|
} else {
|
||||||
list = materialMachineMapper.getMaCodeList(bean);
|
list = materialMachineMapper.getMaCodeList(bean);
|
||||||
|
List<MaterialStorageInfo> useList = materialMachineMapper.getMaCodeDetails(bean);
|
||||||
|
if (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)) {
|
if (CollectionUtils.isNotEmpty(list)) {
|
||||||
for (MaterialStorageInfo useStorageInfo : list) {
|
for (MaterialStorageInfo useStorageInfo : list) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue