|
|
|
@ -1903,23 +1903,21 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
|
|
|
|
|
.ne(DistrilbutionBillPackageEntity::getPacketBarStatus, "2") |
|
|
|
|
); |
|
|
|
|
//没有数据
|
|
|
|
|
if (list.isEmpty()) { |
|
|
|
|
throw new ServiceException("没有包件数据!"); |
|
|
|
|
} |
|
|
|
|
List<Long> sc = new ArrayList<>(); |
|
|
|
|
Iterator<DistrilbutionBillPackageEntity> iterator = v.iterator(); |
|
|
|
|
list.stream().forEach(i -> { |
|
|
|
|
Boolean cz = false; |
|
|
|
|
while (iterator.hasNext()) { |
|
|
|
|
DistrilbutionBillPackageEntity next = iterator.next(); |
|
|
|
|
if (i.getParceListId().equals(next.getParceListId())) { |
|
|
|
|
//存在
|
|
|
|
|
iterator.remove(); |
|
|
|
|
if (!list.isEmpty()) { |
|
|
|
|
Iterator<DistrilbutionBillPackageEntity> iterator = v.iterator(); |
|
|
|
|
list.stream().forEach(i -> { |
|
|
|
|
Boolean cz = false; |
|
|
|
|
while (iterator.hasNext()) { |
|
|
|
|
DistrilbutionBillPackageEntity next = iterator.next(); |
|
|
|
|
if (i.getParceListId().equals(next.getParceListId())) { |
|
|
|
|
//存在
|
|
|
|
|
iterator.remove(); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}); |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
//新增包件
|
|
|
|
|
if (!v.isEmpty()) { |
|
|
|
|
List<DistrilbutionBillPackageEntity> packageEntityList = new ArrayList<>(); |
|
|
|
|