Subversion Repositories SmartDukaan

Rev

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

Rev 30346 Rev 30347
Line 556... Line 556...
556
		ArrayList<in.shop2020.model.v1.order.OrderStatus> orderStatus = new ArrayList<>();
556
		ArrayList<in.shop2020.model.v1.order.OrderStatus> orderStatus = new ArrayList<>();
557
 
557
 
558
		orderStatus.add(in.shop2020.model.v1.order.OrderStatus.SHIPPED_FROM_WH);
558
		orderStatus.add(in.shop2020.model.v1.order.OrderStatus.SHIPPED_FROM_WH);
559
 
559
 
560
		List<Order> order = orderRepository.selectOrders(fofoId, orderStatus);
560
		List<Order> order = orderRepository.selectOrders(fofoId, orderStatus);
561
		List<Integer> shippedOrderIds = order.stream()
561
		List<Integer> shippedOrderIds = order.stream().filter(x -> x.getPartnerGrnTimestamp() == null)
562
				.filter(x -> x.getStatus() == in.shop2020.model.v1.order.OrderStatus.SHIPPED_FROM_WH)
-
 
563
				.map(x -> x.getId()).collect(Collectors.toList());
562
				.map(x -> x.getId()).collect(Collectors.toList());
564
		model.addAttribute("shippedOrderIds", shippedOrderIds);
563
		model.addAttribute("shippedOrderIds", shippedOrderIds);
565
		LOGGER.info("shippedOrderIds {}", shippedOrderIds);
564
		LOGGER.info("shippedOrderIds {}", shippedOrderIds);
566
 
565
 
567
		if (!shippedOrderIds.isEmpty()) {
566
		if (!shippedOrderIds.isEmpty()) {