Subversion Repositories SmartDukaan

Rev

Rev 31336 | Rev 31387 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 31336 Rev 31340
Line 406... Line 406...
406
		if (schemes.isEmpty()) {
406
		if (schemes.isEmpty()) {
407
			return;
407
			return;
408
		}
408
		}
409
		List<InventoryItem> inventoryItems = inventoryItemRepository.selectByPurchaseId(purchaseId);
409
		List<InventoryItem> inventoryItems = inventoryItemRepository.selectByPurchaseId(purchaseId);
410
		//Remove imeis from blocked imeis list
410
		//Remove imeis from blocked imeis list
411
		inventoryItems = inventoryItems.stream().filter(inventoryItem -> BLOCKED_IMEIS.contains(inventoryItem.getSerialNumber())).collect(Collectors.toList());
411
		inventoryItems = inventoryItems.stream().filter(inventoryItem -> !BLOCKED_IMEIS.contains(inventoryItem.getSerialNumber())).collect(Collectors.toList());
412
 
412
 
413
		Set<Integer> itemIds = inventoryItems.stream().map(x -> x.getItemId()).collect(Collectors.toSet());
413
		Set<Integer> itemIds = inventoryItems.stream().map(x -> x.getItemId()).collect(Collectors.toSet());
414
		Map<Integer, Item> itemsMap = itemRepository.selectByIds(itemIds).stream().collect(Collectors.toMap(x -> x.getId(), x -> x));
414
		Map<Integer, Item> itemsMap = itemRepository.selectByIds(itemIds).stream().collect(Collectors.toMap(x -> x.getId(), x -> x));
415
		inventoryItems.stream().forEach(x -> x.setItem(itemsMap.get(x.getItemId())));
415
		inventoryItems.stream().forEach(x -> x.setItem(itemsMap.get(x.getItemId())));
416
 
416
 
Line 609... Line 609...
609
			LOGGER.info("scanRecords --- {}", scanRecords);
609
			LOGGER.info("scanRecords --- {}", scanRecords);
610
			LOGGER.info("inventoryItemIds --- {}", inventoryItemIds);
610
			LOGGER.info("inventoryItemIds --- {}", inventoryItemIds);
611
			Set<InventoryItem> inventoryItems = inventoryItemRepository.selectByIds(inventoryItemIds).stream()
611
			Set<InventoryItem> inventoryItems = inventoryItemRepository.selectByIds(inventoryItemIds).stream()
612
					.filter(x -> x.getSerialNumber() != null && !x.getSerialNumber().equals(""))
612
					.filter(x -> x.getSerialNumber() != null && !x.getSerialNumber().equals(""))
613
					.collect(Collectors.toSet());
613
					.collect(Collectors.toSet());
614
			inventoryItems = inventoryItems.stream().filter(inventoryItem -> BLOCKED_IMEIS.contains(inventoryItem.getSerialNumber())).collect(Collectors.toSet());
614
			inventoryItems = inventoryItems.stream().filter(inventoryItem -> !BLOCKED_IMEIS.contains(inventoryItem.getSerialNumber())).collect(Collectors.toSet());
615
			if (inventoryItems.size() == 0) {
615
			if (inventoryItems.size() == 0) {
616
				return 0;
616
				return 0;
617
			}
617
			}
618
			Set<Integer> itemIds = inventoryItems.stream().map(x -> x.getItemId()).collect(Collectors.toSet());
618
			Set<Integer> itemIds = inventoryItems.stream().map(x -> x.getItemId()).collect(Collectors.toSet());
619
 
619