Subversion Repositories SmartDukaan

Rev

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

Rev 29411 Rev 29412
Line 694... Line 694...
694 
 
 694 
 
695 
			List<Order> vorders = orderRepository.selectByAirwayBillNumber(
 695 
			List<Order> vorders = orderRepository.selectByAirwayBillNumber(
696 
					deliveredList.stream().map(x -> x.getAirwayBillNumber()).collect(Collectors.toList()));
 696 
					deliveredList.stream().map(x -> x.getAirwayBillNumber()).collect(Collectors.toList()));
697 
 
 697 
 
698 
			List<Order> filteredorders = vorders.stream().filter(x -> (x.getStatus() != (OrderStatus.SHIPPED_FROM_WH)
 698 
			List<Order> filteredorders = vorders.stream().filter(x -> (x.getStatus() != (OrderStatus.SHIPPED_FROM_WH)
699 
					|| x.getStatus() != (OrderStatus.DELIVERY_SUCCESS))).collect(Collectors.toList());
 699 
					&& x.getStatus() != (OrderStatus.DELIVERY_SUCCESS))).collect(Collectors.toList());
700 
 
 700 
 
701 
			LOGGER.info("filteredOrder" + filteredorders);
 701 
			LOGGER.info("filteredOrder" + filteredorders);
702 
 
 702 
 
703 
			if (!filteredorders.isEmpty()) {
 703 
			if (!filteredorders.isEmpty()) {
704 
				throw new ProfitMandiBusinessException("Upload File", "",
 704 
				throw new ProfitMandiBusinessException("Upload File", "",