| Line 413... |
Line 413... |
| 413 |
List<InventoryItem> inventoryItems = inventoryItemRepository.selectByPurchaseId(purchaseId);
|
413 |
List<InventoryItem> inventoryItems = inventoryItemRepository.selectByPurchaseId(purchaseId);
|
| 414 |
|
414 |
|
| 415 |
Set<Integer> itemIds = inventoryItems.stream().map(x -> x.getItemId()).collect(Collectors.toSet());
|
415 |
Set<Integer> itemIds = inventoryItems.stream().map(x -> x.getItemId()).collect(Collectors.toSet());
|
| 416 |
LocalDateTime billingDate = purchaseService.getBillingDateOfPurchase(purchaseId);
|
416 |
LocalDateTime billingDate = purchaseService.getBillingDateOfPurchase(purchaseId);
|
| 417 |
Set<Integer> itemIdsSet = tagListingRepository.selectByItemIdsAndTagIds(itemIds, tagIds).stream()
|
417 |
Set<Integer> itemIdsSet = tagListingRepository.selectByItemIdsAndTagIds(itemIds, tagIds).stream()
|
| 418 |
.filter(x -> x.getEolDate().isAfter(billingDate)).map(x -> x.getItemId())
|
418 |
.filter(x -> x.getEolDate()!=null && x.getEolDate().isAfter(billingDate)).map(x -> x.getItemId())
|
| 419 |
.collect(Collectors.toSet());
|
419 |
.collect(Collectors.toSet());
|
| 420 |
// Only consider inventory items that were not returned
|
420 |
// Only consider inventory items that were not returned
|
| 421 |
inventoryItems = inventoryItems.stream().filter(x -> itemIdsSet.contains(x.getItemId()))
|
421 |
inventoryItems = inventoryItems.stream().filter(x -> itemIdsSet.contains(x.getItemId()))
|
| 422 |
.filter(x -> !x.getLastScanType().equals(ScanType.PURCHASE_RET_BAD))
|
422 |
.filter(x -> !x.getLastScanType().equals(ScanType.PURCHASE_RET_BAD))
|
| 423 |
.filter(x -> !x.getLastScanType().equals(ScanType.PURCHASE_RET)).collect(Collectors.toList());
|
423 |
.filter(x -> !x.getLastScanType().equals(ScanType.PURCHASE_RET)).collect(Collectors.toList());
|
| Line 540... |
Line 540... |
| 540 |
.filter(x -> x.getSerialNumber() != null && !x.getSerialNumber().equals(""))
|
540 |
.filter(x -> x.getSerialNumber() != null && !x.getSerialNumber().equals(""))
|
| 541 |
.collect(Collectors.toSet());
|
541 |
.collect(Collectors.toSet());
|
| 542 |
Set<Integer> itemIds = inventoryItems.stream().map(x -> x.getItemId()).collect(Collectors.toSet());
|
542 |
Set<Integer> itemIds = inventoryItems.stream().map(x -> x.getItemId()).collect(Collectors.toSet());
|
| 543 |
|
543 |
|
| 544 |
Set<Integer> itemIdsSet = tagListingRepository.selectByItemIdsAndTagIds(itemIds, tagIds).stream()
|
544 |
Set<Integer> itemIdsSet = tagListingRepository.selectByItemIdsAndTagIds(itemIds, tagIds).stream()
|
| 545 |
.filter(x -> x.getEolDate().isAfter(fofoOrder.getCreateTimestamp())).map(x -> x.getItemId())
|
545 |
.filter(x -> x.getEolDate()!=null && x.getEolDate().isAfter(fofoOrder.getCreateTimestamp())).map(x -> x.getItemId())
|
| 546 |
.collect(Collectors.toSet());
|
546 |
.collect(Collectors.toSet());
|
| 547 |
// Only consider inventory items that were not returned
|
547 |
// Only consider inventory items that were not returned
|
| 548 |
inventoryItems = inventoryItems.stream().filter(x -> itemIdsSet.contains(x.getItemId()))
|
548 |
inventoryItems = inventoryItems.stream().filter(x -> itemIdsSet.contains(x.getItemId()))
|
| 549 |
.collect(Collectors.toSet());
|
549 |
.collect(Collectors.toSet());
|
| 550 |
|
550 |
|