|
|
@@ -395,7 +395,9 @@ public class AuditPathsServiceImpl implements IAuditPathsService {
|
|
|
if (Objects.equals(auditItems.getActId(), 120L)) {
|
|
|
List<TWarehousebillsfees> feesList = tWarehousebillsfeesMapper.selectWarehousebillsfeesByPId(auditItems.getBillId());
|
|
|
// 过滤出明细信息查询是否存在已计算仓储费
|
|
|
- List<Long> ids = feesList.stream().filter(li -> !li.getfBilltype().equals(WarehouseTypeEnum.KCZZ.getType()))
|
|
|
+ List<Long> ids = feesList.stream().filter(li -> null != li.getfBilltype()
|
|
|
+ && !li.getfBilltype().equals(WarehouseTypeEnum.KCZZ.getType())
|
|
|
+ && null != li.getSrcId())
|
|
|
.map(TWarehousebillsfees::getSrcId).distinct().collect(toList());
|
|
|
if (CollectionUtils.isNotEmpty(ids) && tWarehousebillsitemsMapper.selectIsCalculateStorageFeesByIds(ids) > 0) {
|
|
|
throw new WarehouseException("计算费用中存在已计算仓储费信息");
|
wangzhuo