Subversion Repositories SmartDukaan

Rev

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

Rev 31329 Rev 31362
Line 752... Line 752...
752 
		if (!deliveredList.isEmpty()) {
 752 
		if (!deliveredList.isEmpty()) {
753 
 
 753 
 
754 
			List<Order> vorders = orderRepository.selectByAirwayBillNumber(
 754 
			List<Order> vorders = orderRepository.selectByAirwayBillNumber(
755 
					deliveredList.stream().map(x -> x.getAirwayBillNumber()).collect(Collectors.toList()));
 755 
					deliveredList.stream().map(x -> x.getAirwayBillNumber()).collect(Collectors.toList()));
756 
 
 756 
 
- 
 
 757 
			List<Order> filteredorders = vorders.stream()
757 
			List<Order> filteredorders = vorders.stream().filter(x -> (x.getStatus().equals(OrderStatus.SHIPPED_FROM_WH)
 758 
					.filter(x -> (!x.getStatus().equals(OrderStatus.SHIPPED_FROM_WH)
758 
					&& !x.getStatus().equals(OrderStatus.DELIVERY_SUCCESS))).collect(Collectors.toList());
 759 
							&& !x.getStatus().equals(OrderStatus.DELIVERY_SUCCESS)))
- 
 
 760 
					.collect(Collectors.toList());
759 
 
 761 
 
760 
			LOGGER.info("filteredOrder" + filteredorders);
 762 
			LOGGER.info("filteredOrder" + filteredorders);
761 
 
 763 
 
762 
			if (!filteredorders.isEmpty()) {
 764 
			if (!filteredorders.isEmpty()) {
763 
				throw new ProfitMandiBusinessException("Upload File",
 765 
				throw new ProfitMandiBusinessException("Upload File",
Line 853... Line 855...
853 
 
 855 
 
854 
	}
 856 
	}
855 
 
 857 
 
856 
	@RequestMapping(value = "/getDelayBillingFileUploader", method = RequestMethod.POST)
 858 
	@RequestMapping(value = "/getDelayBillingFileUploader", method = RequestMethod.POST)
857 
	public String getDelayBillingFileUploader(HttpServletRequest request, Model model, HttpServletResponse response,
 859 
	public String getDelayBillingFileUploader(HttpServletRequest request, Model model, HttpServletResponse response,
858 
											  @RequestPart MultipartFile file) throws Throwable {
 860 
			@RequestPart MultipartFile file) throws Throwable {
859 
 
 861 
 
860 
		LOGGER.info("file" + file.toString());
 862 
		LOGGER.info("file" + file.toString());
861 
		String fileName = file.getName();
 863 
		String fileName = file.getName();
862 
 
 864 
 
863 
		String fileNames = file.getOriginalFilename();
 865 
		String fileNames = file.getOriginalFilename();