| Line 284... |
Line 284... |
| 284 |
|
284 |
|
| 285 |
if (provider == null) {
|
285 |
if (provider == null) {
|
| 286 |
throw new ProfitMandiBusinessException("Uploaded File", "", "Provider is not Available");
|
286 |
throw new ProfitMandiBusinessException("Uploaded File", "", "Provider is not Available");
|
| 287 |
}
|
287 |
}
|
| 288 |
if (!orders.isEmpty()) {
|
288 |
if (!orders.isEmpty()) {
|
| 289 |
dispatchNotication = logisticsService.markedOrderShippedDetail(orders, provider, dispatchNotication, bl.getAirwayBillNumber());
|
289 |
dispatchNotication = logisticsService.markedOrderShippedDetail(orders, provider, dispatchNotication, bl.getAirwayBillNumber(), bl.getShippingDate());
|
| 290 |
|
290 |
|
| 291 |
} else {
|
291 |
} else {
|
| 292 |
throw new ProfitMandiBusinessException("Uploaded File", "", "No Order Found");
|
292 |
throw new ProfitMandiBusinessException("Uploaded File", "", "No Order Found");
|
| 293 |
}
|
293 |
}
|
| 294 |
|
294 |
|
| Line 340... |
Line 340... |
| 340 |
BilledOrderListModel bol = new BilledOrderListModel();
|
340 |
BilledOrderListModel bol = new BilledOrderListModel();
|
| 341 |
bol.setInvoiceNumber(record.get(0));
|
341 |
bol.setInvoiceNumber(record.get(0));
|
| 342 |
bol.setLogisticsProviderName(record.get(1));
|
342 |
bol.setLogisticsProviderName(record.get(1));
|
| 343 |
bol.setAirwayBillNumber(record.get(2));
|
343 |
bol.setAirwayBillNumber(record.get(2));
|
| 344 |
bol.setWeight(Double.valueOf(record.get(3)));
|
344 |
bol.setWeight(Double.valueOf(record.get(3)));
|
| 345 |
bol.setShippingDate(String.valueOf(LocalDateTime.parse(record.get(4), FormattingUtils.dateTimeFormatter)));
|
345 |
bol.setShippingDate(LocalDateTime.parse(record.get(4), FormattingUtils.dateTimeFormatter));
|
| 346 |
// bol.setShippingDate(String.valueOf(LocalDateTime.parse(record.get(4), FormattingUtils.yyMMDDTimeFormatter)));
|
346 |
// bol.setShippingDate(String.valueOf(LocalDateTime.parse(record.get(4), FormattingUtils.yyMMDDTimeFormatter)));
|
| 347 |
//rkb
|
347 |
//rkb
|
| 348 |
|
348 |
|
| 349 |
//bol.setShipping_Date(record.get(formattingUtils.formatDateTime(ofpat)));
|
349 |
//bol.setShipping_Date(record.get(formattingUtils.formatDateTime(ofpat)));
|
| 350 |
//bol.setShipping_Date(record.get(FormattingUtils.formatDateTime(yyyy-MM-dd HH:mm));
|
350 |
//bol.setShipping_Date(record.get(FormattingUtils.formatDateTime(yyyy-MM-dd HH:mm));
|