| Line 482... |
Line 482... |
| 482 |
@RequestMapping(value = "/getGrnPendingOrderStatus", method = RequestMethod.GET)
|
482 |
@RequestMapping(value = "/getGrnPendingOrderStatus", method = RequestMethod.GET)
|
| 483 |
public String getGrnPendingOrderStatus(HttpServletRequest request, Model model) throws Exception {
|
483 |
public String getGrnPendingOrderStatus(HttpServletRequest request, Model model) throws Exception {
|
| 484 |
|
484 |
|
| 485 |
LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
|
485 |
LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
|
| 486 |
int fofoId = loginDetails.getFofoId();
|
486 |
int fofoId = loginDetails.getFofoId();
|
| 487 |
List<Order> order = orderRepository.selectGrnTimestampNull(fofoId, Arrays.asList(in.shop2020.model.v1.order.OrderStatus.DELIVERY_SUCCESS));
|
487 |
List<Order> grnPendingOrders = orderRepository.selectGrnTimestampNull(fofoId, Arrays.asList(in.shop2020.model.v1.order.OrderStatus.DELIVERY_SUCCESS));
|
| 488 |
|
488 |
|
| 489 |
List<LineItem> grnPendingLineItemIds = order.stream()
|
- |
|
| 490 |
.filter(x -> x.getStatus() == in.shop2020.model.v1.order.OrderStatus.DELIVERY_SUCCESS)
|
- |
|
| 491 |
.map(x -> x.getLineItem()).collect(Collectors.toList());
|
- |
|
| 492 |
|
- |
|
| 493 |
Map<Integer, LineItem> grnPendingLineMap = grnPendingLineItemIds.stream()
|
- |
|
| 494 |
.collect(Collectors.toMap(x -> x.getOrderId(), x -> x));
|
- |
|
| 495 |
LOGGER.info("grnPendingLineMap {}", grnPendingLineMap);
|
- |
|
| 496 |
model.addAttribute("grnPendingLineMap", grnPendingLineMap);
|
489 |
model.addAttribute("grnPendingOrders", grnPendingOrders);
|
| 497 |
Map<Integer, Order> orderMap = order.stream().collect(Collectors.toMap(x -> x.getId(), x -> x));
|
- |
|
| 498 |
|
- |
|
| 499 |
model.addAttribute("orderMap", orderMap);
|
- |
|
| 500 |
return "purchase-grn-order-status";
|
490 |
return "purchase-grn-order-status";
|
| 501 |
}
|
491 |
}
|
| 502 |
|
492 |
|
| 503 |
@RequestMapping(value = "/getPendingOrderStatus", method = RequestMethod.GET)
|
493 |
@RequestMapping(value = "/getPendingOrderStatus", method = RequestMethod.GET)
|
| 504 |
public String getPendingOrderStatus(HttpServletRequest request, Model model) throws Exception {
|
494 |
public String getPendingOrderStatus(HttpServletRequest request, Model model) throws Exception {
|