| Line 588... |
Line 588... |
| 588 |
if (!delayDayList.isEmpty()) {
|
588 |
if (!delayDayList.isEmpty()) {
|
| 589 |
|
589 |
|
| 590 |
List<Order> vorders = orderRepository.selectByAirwayBillNumber(
|
590 |
List<Order> vorders = orderRepository.selectByAirwayBillNumber(
|
| 591 |
delayDayList.stream().map(x -> x.getAirwayBIllNumber()).collect(Collectors.toList()));
|
591 |
delayDayList.stream().map(x -> x.getAirwayBIllNumber()).collect(Collectors.toList()));
|
| 592 |
|
592 |
|
| 593 |
List<Order> filteredorders = vorders.stream()
|
593 |
List<Order> filteredorders = vorders.stream().filter(x -> x.getStatus() != (OrderStatus.SHIPPED_FROM_WH))
|
| 594 |
.filter(x -> !x.getStatus().equals(OrderStatus.SHIPPED_FROM_WH)).collect(Collectors.toList());
|
594 |
.collect(Collectors.toList());
|
| 595 |
|
595 |
|
| 596 |
if (!filteredorders.isEmpty()) {
|
596 |
if (!filteredorders.isEmpty()) {
|
| 597 |
throw new ProfitMandiBusinessException("Upload File", "",
|
597 |
throw new ProfitMandiBusinessException("Upload File", "",
|
| 598 |
"Order status should be shipped from warehouse");
|
598 |
"Order status should be shipped from warehouse");
|
| 599 |
|
599 |
|
| Line 693... |
Line 693... |
| 693 |
if (!deliveredList.isEmpty()) {
|
693 |
if (!deliveredList.isEmpty()) {
|
| 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()
|
- |
|
| 699 |
.filter(x -> (x.getStatus() == (OrderStatus.SHIPPED_FROM_WH)
|
698 |
List<Order> filteredorders = vorders.stream().filter(x -> (x.getStatus() != (OrderStatus.SHIPPED_FROM_WH)
|
| 700 |
|| x.getStatus() != (OrderStatus.DELIVERY_SUCCESS)))
|
699 |
|| x.getStatus() != (OrderStatus.DELIVERY_SUCCESS))).collect(Collectors.toList());
|
| 701 |
.collect(Collectors.toList());
|
- |
|
| 702 |
|
700 |
|
| 703 |
LOGGER.info("filteredOrder"+ filteredorders);
|
701 |
LOGGER.info("filteredOrder" + filteredorders);
|
| 704 |
|
702 |
|
| 705 |
if (!filteredorders.isEmpty()) {
|
703 |
if (!filteredorders.isEmpty()) {
|
| 706 |
throw new ProfitMandiBusinessException("Upload File", "",
|
704 |
throw new ProfitMandiBusinessException("Upload File", "",
|
| 707 |
"Order status should be shipped from warehouse");
|
705 |
"Order status should be shipped from warehouse");
|
| 708 |
|
706 |
|