| Line 315... |
Line 315... |
| 315 |
params.put("MANUAL_itemId", StringUtils.join(itemIds, ","));
|
315 |
params.put("MANUAL_itemId", StringUtils.join(itemIds, ","));
|
| 316 |
Map<String, String> params1 = new HashMap<>();
|
316 |
Map<String, String> params1 = new HashMap<>();
|
| 317 |
params1.put("MANUAL_criteriaDate_FROMDATE", FormattingUtils.formatReporitcoDate(affectedOn));
|
317 |
params1.put("MANUAL_criteriaDate_FROMDATE", FormattingUtils.formatReporitcoDate(affectedOn));
|
| 318 |
params1.put("MANUAL_criteriaItemId", StringUtils.join(itemIds, ","));
|
318 |
params1.put("MANUAL_criteriaItemId", StringUtils.join(itemIds, ","));
|
| 319 |
|
319 |
|
| 320 |
Map<String, String> params2 = new HashMap<>();
|
- |
|
| 321 |
params2.put("MANUAL_Criteria2_FROMDATE", FormattingUtils.formatReporitcoDate(affectedOn));
|
- |
|
| 322 |
params2.put("MANUAL_Criteria1", StringUtils.join(itemIds, ","));
|
- |
|
| 323 |
List<? extends ImeiDropSummaryModel> grnPendingList = getReports(GrnPendingDataModel.class,
|
320 |
List<? extends ImeiDropSummaryModel> grnPendingList = getReports(GrnPendingDataModel.class,
|
| 324 |
ReporticoProject.FOCO, "imeispendinggrn.xml", params);
|
321 |
ReporticoProject.FOCO, "imeispendinggrn.xml", params);
|
| 325 |
List<? extends ImeiDropSummaryModel> partnerImeiNotSoldList = getReports(PartnerImeiNotSold.class,
|
322 |
List<? extends ImeiDropSummaryModel> partnerImeiNotSoldList = getReports(PartnerImeiNotSold.class,
|
| 326 |
ReporticoProject.FOCO, "PartnerIMEINotSold.xml", params1);
|
323 |
ReporticoProject.FOCO, "PartnerIMEINotSold.xml", params1);
|
| 327 |
List<? extends ImeiDropSummaryModel> itemStockOnDateList = getReports(ClosingStockOnDate.class,
|
- |
|
| 328 |
ReporticoProject.WAREHOUSENEW, "itemstockondate.xml", params2);
|
- |
|
| - |
|
324 |
|
| 329 |
List<ImeiDropSummaryModel> mergedImeis = new ArrayList<>();
|
325 |
List<ImeiDropSummaryModel> mergedImeis = new ArrayList<>();
|
| 330 |
mergedImeis.addAll(grnPendingList);
|
326 |
mergedImeis.addAll(grnPendingList);
|
| 331 |
mergedImeis.addAll(partnerImeiNotSoldList);
|
327 |
mergedImeis.addAll(partnerImeiNotSoldList);
|
| 332 |
|
328 |
|
| 333 |
return mergedImeis;
|
329 |
return mergedImeis;
|
| Line 344... |
Line 340... |
| 344 |
params.put("MANUAL_itemId", StringUtils.join(itemIds, ","));
|
340 |
params.put("MANUAL_itemId", StringUtils.join(itemIds, ","));
|
| 345 |
|
341 |
|
| 346 |
Map<String, String> params1 = new HashMap<>();
|
342 |
Map<String, String> params1 = new HashMap<>();
|
| 347 |
params1.put("MANUAL_criteriaDate_FROMDATE", FormattingUtils.formatReporitcoDate(affectedOn));
|
343 |
params1.put("MANUAL_criteriaDate_FROMDATE", FormattingUtils.formatReporitcoDate(affectedOn));
|
| 348 |
params1.put("MANUAL_criteriaItemId", StringUtils.join(itemIds, ","));
|
344 |
params1.put("MANUAL_criteriaItemId", StringUtils.join(itemIds, ","));
|
| - |
|
345 |
|
| - |
|
346 |
|
| - |
|
347 |
Map<String, String> params2 = new HashMap<>();
|
| - |
|
348 |
params2.put("MANUAL_Criteria2_FROMDATE", FormattingUtils.formatReporitcoDate(affectedOn));
|
| - |
|
349 |
params2.put("MANUAL_Criteria1", StringUtils.join(itemIds, ","));
|
| - |
|
350 |
|
| 349 |
|
351 |
|
| 350 |
List<? extends ImeiDropSummaryModel> grnPendingList = getReports(GrnPendingDataModel.class,
|
352 |
List<? extends ImeiDropSummaryModel> grnPendingList = getReports(GrnPendingDataModel.class,
|
| 351 |
ReporticoProject.FOCO, "imeispendinggrn.xml", params);
|
353 |
ReporticoProject.FOCO, "imeispendinggrn.xml", params);
|
| 352 |
List<? extends ImeiDropSummaryModel> partnerImeiNotSoldList = getReports(PartnerImeiNotSold.class,
|
354 |
List<? extends ImeiDropSummaryModel> partnerImeiNotSoldList = getReports(PartnerImeiNotSold.class,
|
| 353 |
ReporticoProject.FOCO, "PartnerIMEINotSold.xml", params1);
|
355 |
ReporticoProject.FOCO, "PartnerIMEINotSold.xml", params1);
|
| - |
|
356 |
List<? extends ImeiDropSummaryModel> itemStockOnDateList = getReports(ClosingStockOnDate.class,
|
| - |
|
357 |
ReporticoProject.WAREHOUSENEW, "itemstockondate.xml", params2);
|
| 354 |
|
358 |
|
| 355 |
List<ImeiDropSummaryModel> mergedImeis = new ArrayList<>();
|
359 |
List<ImeiDropSummaryModel> mergedImeis = new ArrayList<>();
|
| 356 |
mergedImeis.addAll(grnPendingList);
|
360 |
mergedImeis.addAll(grnPendingList);
|
| 357 |
mergedImeis.addAll(partnerImeiNotSoldList);
|
361 |
mergedImeis.addAll(partnerImeiNotSoldList);
|
| - |
|
362 |
mergedImeis.addAll(itemStockOnDateList);
|
| 358 |
|
363 |
|
| 359 |
List<List<Object>> rows = new ArrayList<>();
|
364 |
List<List<Object>> rows = new ArrayList<>();
|
| 360 |
for (ImeiDropSummaryModel imeiDropSummaryModel : mergedImeis) {
|
365 |
for (ImeiDropSummaryModel imeiDropSummaryModel : mergedImeis) {
|
| 361 |
List<Object> row = new ArrayList<>();
|
366 |
List<Object> row = new ArrayList<>();
|
| 362 |
row.add(imeiDropSummaryModel.getSerialNumber());
|
367 |
row.add(imeiDropSummaryModel.getSerialNumber());
|