|
@@ -4642,12 +4642,13 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
|
return AjaxResult.error("未找到信息,请刷新页面重试");
|
|
|
}
|
|
|
Map<String, Object> map = new HashMap<>();
|
|
|
- List<TWarehousebillsfees> itemsList = new ArrayList<>();
|
|
|
TWarehousebillsfees warehousebillsfees = new TWarehousebillsfees();
|
|
|
warehousebillsfees.setfPid(fId);
|
|
|
List<TWarehousebillsfees> warehouseFeesList = tWarehousebillsfeesMapper.selectTWarehousebillsfeesList(warehousebillsfees);
|
|
|
|
|
|
- List<TWarehousebillsfees> feesList = warehouseFeesList.stream().filter(li -> StringUtils.isNotNull(li.getSrcId()))
|
|
|
+ List<TWarehousebillsfees> itemsList = warehouseFeesList.stream().filter(li -> StringUtils.isNotNull(li.getSrcId()))
|
|
|
+ .collect(toList());
|
|
|
+ List<TWarehousebillsfees> feesList = warehouseFeesList.stream().filter(li -> StringUtils.isNull(li.getSrcId()))
|
|
|
.collect(toList());
|
|
|
// 查出所有仓库 给后续匹配仓库名字使用
|
|
|
List<TWarehouse> warehouseList = tWarehouseMapper.selectTWarehouseList(new TWarehouse());
|