| Line 62... |
Line 62... |
| 62 |
import java.io.ByteArrayInputStream;
|
62 |
import java.io.ByteArrayInputStream;
|
| 63 |
import java.io.InputStream;
|
63 |
import java.io.InputStream;
|
| 64 |
import java.time.LocalDate;
|
64 |
import java.time.LocalDate;
|
| 65 |
import java.time.LocalDateTime;
|
65 |
import java.time.LocalDateTime;
|
| 66 |
import java.time.format.DateTimeFormatter;
|
66 |
import java.time.format.DateTimeFormatter;
|
| - |
|
67 |
import java.time.format.DateTimeFormatterBuilder;
|
| - |
|
68 |
import java.time.temporal.ChronoField;
|
| 67 |
import java.util.*;
|
69 |
import java.util.*;
|
| 68 |
import java.util.Map.Entry;
|
70 |
import java.util.Map.Entry;
|
| 69 |
import java.util.stream.Collectors;
|
71 |
import java.util.stream.Collectors;
|
| 70 |
|
72 |
|
| 71 |
@Controller
|
73 |
@Controller
|
| Line 127... |
Line 129... |
| 127 |
@Autowired
|
129 |
@Autowired
|
| 128 |
private BluedartService bluedartService;
|
130 |
private BluedartService bluedartService;
|
| 129 |
|
131 |
|
| 130 |
private static final Logger LOGGER = LogManager.getLogger(LogisticsController.class);
|
132 |
private static final Logger LOGGER = LogManager.getLogger(LogisticsController.class);
|
| 131 |
|
133 |
|
| - |
|
134 |
private static final DateTimeFormatter SHIPPING_DATE_FORMATTER = new DateTimeFormatterBuilder()
|
| - |
|
135 |
.appendPattern("dd-MM-yyyy[ HH:mm[:ss]]")
|
| - |
|
136 |
.parseDefaulting(ChronoField.HOUR_OF_DAY, 0)
|
| - |
|
137 |
.parseDefaulting(ChronoField.MINUTE_OF_HOUR, 0)
|
| - |
|
138 |
.parseDefaulting(ChronoField.SECOND_OF_MINUTE, 0)
|
| - |
|
139 |
.toFormatter();
|
| - |
|
140 |
|
| 132 |
@RequestMapping(value = "/logistics", method = RequestMethod.GET)
|
141 |
@RequestMapping(value = "/logistics", method = RequestMethod.GET)
|
| 133 |
public String logistics(HttpServletRequest request, Model model) throws Exception {
|
142 |
public String logistics(HttpServletRequest request, Model model) throws Exception {
|
| 134 |
ProviderTat pt = providerTatRepository.selectByProviderId(1, 7678, "110018");
|
143 |
ProviderTat pt = providerTatRepository.selectByProviderId(1, 7678, "110018");
|
| 135 |
|
144 |
|
| 136 |
return "logistics";
|
145 |
return "logistics";
|
| Line 365... |
Line 374... |
| 365 |
BilledOrderListModel bol = new BilledOrderListModel();
|
374 |
BilledOrderListModel bol = new BilledOrderListModel();
|
| 366 |
bol.setInvoiceNumber(record.get(0));
|
375 |
bol.setInvoiceNumber(record.get(0));
|
| 367 |
bol.setLogisticsProviderName(record.get(1));
|
376 |
bol.setLogisticsProviderName(record.get(1));
|
| 368 |
bol.setAirwayBillNumber(record.get(2));
|
377 |
bol.setAirwayBillNumber(record.get(2));
|
| 369 |
bol.setWeight(Double.valueOf(record.get(3)));
|
378 |
bol.setWeight(Double.valueOf(record.get(3)));
|
| 370 |
bol.setShippingDate(LocalDateTime.parse(record.get(4), FormattingUtils.dateTimeFormatter));
|
379 |
bol.setShippingDate(LocalDateTime.parse(record.get(4), SHIPPING_DATE_FORMATTER));
|
| 371 |
// bol.setShippingDate(String.valueOf(LocalDateTime.parse(record.get(4), FormattingUtils.yyMMDDTimeFormatter)));
|
380 |
// bol.setShippingDate(String.valueOf(LocalDateTime.parse(record.get(4), FormattingUtils.yyMMDDTimeFormatter)));
|
| 372 |
//rkb
|
381 |
//rkb
|
| 373 |
|
382 |
|
| 374 |
//bol.setShipping_Date(record.get(formattingUtils.formatDateTime(ofpat)));
|
383 |
//bol.setShipping_Date(record.get(formattingUtils.formatDateTime(ofpat)));
|
| 375 |
//bol.setShipping_Date(record.get(FormattingUtils.formatDateTime(yyyy-MM-dd HH:mm));
|
384 |
//bol.setShipping_Date(record.get(FormattingUtils.formatDateTime(yyyy-MM-dd HH:mm));
|