Skip to content

Commit ce01105

Browse files
vanitha1822vanitha1822
authored
Fix the issue in Downloading Reports (#117)
* fix: column datatype mismatch issue * fix: report download issue in AMM-2017
1 parent 7e2639f commit ce01105

1 file changed

Lines changed: 50 additions & 57 deletions

File tree

‎src/main/java/com/iemr/inventory/service/report/CRMReportServiceImpl.java‎

Lines changed: 50 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -223,31 +223,31 @@ public String getDailyStockDetailsReport(ItemStockEntryReport entryReport) {
223223
openingStock = ((Number) objects[10]).longValue();
224224
}
225225
Long adjustedQuantity_FromDate = 0L;
226-
if (objects[11] != null) {
227-
adjustedQuantity_FromDate = ((Number) objects[11]).longValue();
226+
if (objects[15] != null) {
227+
adjustedQuantity_FromDate = ((Number) objects[15]).longValue();
228228
}
229229
Long quantityDispanced = 0L;
230-
if (objects[12] != null) {
231-
quantityDispanced = ((Number) objects[12]).longValue();
230+
if (objects[11] != null) {
231+
quantityDispanced = ((Number) objects[11]).longValue();
232232
}
233-
String itemName = (String) objects[13];
234-
String facilityName = (String) objects[14];
235-
String itemCategoryName = (String) objects[15];
233+
String itemName = (String) objects[12];
234+
String facilityName = (String) objects[13];
235+
String itemCategoryName = (String) objects[14];
236236
Long adjustedQuantity_ToDate = 0L;
237-
if (objects[16] != null) {
238-
adjustedQuantity_ToDate = ((Number) objects[16]).longValue();
237+
if (objects[15] != null) {
238+
adjustedQuantity_ToDate = ((Number) objects[15]).longValue();
239239
}
240240
Long adjustedQuantity_ToDate_Receipt = 0L;
241-
if (objects[17] != null) {
242-
adjustedQuantity_ToDate_Receipt = ((Number) objects[17]).longValue();
241+
if (objects[16] != null) {
242+
adjustedQuantity_ToDate_Receipt = ((Number) objects[16]).longValue();
243243
}
244244
Long adjustedQuantity_ToDate_Issue = 0L;
245-
if (objects[18] != null) {
246-
adjustedQuantity_ToDate_Issue = ((Number) objects[18]).longValue();
245+
if (objects[17] != null) {
246+
adjustedQuantity_ToDate_Issue = ((Number) objects[17]).longValue();
247247
}
248248
Long ClosingStock = 0L;
249-
if (objects[19] != null) {
250-
ClosingStock = ((Number) objects[19]).longValue();
249+
if (objects[18] != null) {
250+
ClosingStock = ((Number) objects[18]).longValue();
251251
}
252252

253253

@@ -421,31 +421,31 @@ public String getMonthlyReport(ItemStockEntryReport entryReport) {
421421
openingStock = ((Number) objects[10]).longValue();
422422
}
423423
Long adjustedQuantity_FromDate = 0L;
424-
if (objects[11] != null) {
425-
adjustedQuantity_FromDate = ((Number) objects[11]).longValue();
424+
if (objects[15] != null) {
425+
adjustedQuantity_FromDate = ((Number) objects[15]).longValue();
426426
}
427427
Long quantityDispanced = 0L;
428-
if (objects[12] != null) {
429-
quantityDispanced = ((Number) objects[12]).longValue();
428+
if (objects[11] != null) {
429+
quantityDispanced = ((Number) objects[11]).longValue();
430430
}
431-
String itemName = (String) objects[13];
432-
String facilityName = (String) objects[14];
433-
String itemCategoryName = (String) objects[15];
431+
String itemName = (String) objects[12];
432+
String facilityName = (String) objects[13];
433+
String itemCategoryName = (String) objects[14];
434434
Long adjustedQuantity_ToDate = 0L;
435-
if (objects[16] != null) {
436-
adjustedQuantity_ToDate = ((Number) objects[16]).longValue();
435+
if (objects[15] != null) {
436+
adjustedQuantity_ToDate = ((Number) objects[15]).longValue();
437437
}
438438
Long adjustedQuantity_ToDate_Receipt = 0L;
439-
if (objects[17] != null) {
440-
adjustedQuantity_ToDate_Receipt = ((Number) objects[17]).longValue();
439+
if (objects[16] != null) {
440+
adjustedQuantity_ToDate_Receipt = ((Number) objects[16]).longValue();
441441
}
442442
Long adjustedQuantity_ToDate_Issue = 0L;
443-
if (objects[18] != null) {
444-
adjustedQuantity_ToDate_Issue = ((Number) objects[18]).longValue();
443+
if (objects[17] != null) {
444+
adjustedQuantity_ToDate_Issue = ((Number) objects[17]).longValue();
445445
}
446446
Long ClosingStock = 0L;
447-
if (objects[19] != null) {
448-
ClosingStock = ((Number) objects[19]).longValue();
447+
if (objects[18] != null) {
448+
ClosingStock = ((Number) objects[18]).longValue();
449449
}
450450
// Long actualOpening = openingStock + adjustedQuantity_FromDate;
451451
Long actualOpening = openingStock;
@@ -520,57 +520,50 @@ public String getYearlyReport(ItemStockEntryReport entryReport) {
520520
for (Object[] objects : reports) {
521521
if (objects != null && objects.length > 0) {
522522

523-
String batchNo = (String) objects[3];
523+
String batchNo = objects[3] != null ? objects[3].toString() : null;
524524
Long totalQuantityReceived = 0L;
525525
if (objects[4] != null) {
526-
totalQuantityReceived = ((Number) objects[4]).longValue();
526+
totalQuantityReceived = Long.valueOf(objects[4].toString());
527527
}
528528
Double unitCostPrice = 0.0;
529529
if (objects[5] != null) {
530-
unitCostPrice = ((Number) objects[5]).doubleValue();
530+
unitCostPrice = Double.valueOf(objects[5].toString());
531531
}
532532
Date expiryDate = (Date) objects[6];
533533
Long openingStock = 0L;
534534
if (objects[10] != null) {
535-
openingStock = ((Number) objects[10]).longValue();
535+
openingStock = Long.valueOf(objects[10].toString());
536536
}
537537
Long adjustedQuantity_FromDate = 0L;
538-
if (objects[11] != null) {
539-
adjustedQuantity_FromDate = ((Number) objects[11]).longValue();
538+
if (objects[15] != null) {
539+
adjustedQuantity_FromDate = Long.valueOf(objects[15].toString());
540540
}
541541
Long quantityDispanced = 0L;
542-
if (objects[12] != null) {
543-
quantityDispanced = ((Number) objects[12]).longValue();
542+
if (objects[11] != null) {
543+
quantityDispanced = Long.valueOf(objects[11].toString());
544544
}
545-
String itemName = (String) objects[13];
546-
String facilityName = (String) objects[14];
547-
String itemCategoryName = (String) objects[15];
545+
String itemName = objects[12] != null ? objects[12].toString() : null;
546+
String facilityName = objects[13] != null ? objects[13].toString() : null;
547+
String itemCategoryName = objects[14] != null ? objects[14].toString() : null;
548548
Long adjustedQuantity_ToDate = 0L;
549-
if (objects[16] != null) {
550-
adjustedQuantity_ToDate = ((Number) objects[16]).longValue();
549+
if (objects[15] != null) {
550+
adjustedQuantity_ToDate = Long.valueOf(objects[15].toString());
551551
}
552552
Long adjustedQuantity_ToDate_Receipt = 0L;
553-
if (objects[17] != null) {
554-
adjustedQuantity_ToDate_Receipt = ((Number) objects[17]).longValue();
553+
if (objects[16] != null) {
554+
adjustedQuantity_ToDate_Receipt = Long.valueOf(objects[16].toString());
555555
}
556556
Long adjustedQuantity_ToDate_Issue = 0L;
557-
if (objects[18] != null) {
558-
adjustedQuantity_ToDate_Issue = ((Number) objects[18]).longValue();
557+
if (objects[17] != null) {
558+
adjustedQuantity_ToDate_Issue = Long.valueOf(objects[17].toString());
559559
}
560560
Long ClosingStock = 0L;
561-
if (objects[19] != null) {
562-
ClosingStock = ((Number) objects[19]).longValue();
561+
if (objects[18] != null) {
562+
ClosingStock = Long.valueOf(objects[18].toString());
563563
}
564-
// Long actualOpening = openingStock + adjustedQuantity_FromDate;
565564
Long actualOpening = openingStock;
566-
Long actualDispensed = quantityDispanced;// - adjustedQuantity_ToDate;
565+
Long actualDispensed = quantityDispanced;
567566
Long actualClosing = ClosingStock;
568-
// if (actualOpening == 0 || actualOpening == null) {
569-
// actualClosing = totalQuantityReceived - actualDispensed + adjustedQuantity_ToDate;
570-
// } else {
571-
// actualClosing = actualOpening - actualDispensed + adjustedQuantity_ToDate;
572-
// totalQuantityReceived = 0L;
573-
// }
574567

575568
YearlyReport stockDetail = new YearlyReport();
576569
stockDetail.setSlNo(slNo++);

0 commit comments

Comments
 (0)