Skip to content

fix: add EntryType and item form to stock detail reports #137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vishwab1 merged 1 commit into from
Sep 25, 2026
Merged

fix: add EntryType and item form to stock detail reports #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/main/java/com/iemr/inventory/model/report/DailyStockDetails.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,12 @@ public class DailyStockDetails {

private Timestamp date;

private String entryType;

private String facilityName;

private String itemForm;

private String itemName;

private String itemCategory;
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/com/iemr/inventory/model/report/MonthlyReport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,12 @@ public class MonthlyReport {

private Integer year;

private String entryType;

private String facilityName;

private String itemForm;

private String itemName;

private String itemCategory;
Expand Down
7 changes: 7 additions & 0 deletions src/main/java/com/iemr/inventory/model/report/YearlyReport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
package com.iemr.inventory.model.report;

import java.sql.Date;
import java.sql.Timestamp;

import com.google.gson.GsonBuilder;
import com.google.gson.LongSerializationPolicy;
Expand All @@ -35,8 +36,12 @@ public class YearlyReport {

private Integer year;

private String entryType;

private String facilityName;

private String itemForm;

private String itemName;

private String itemCategory;
Expand All @@ -63,6 +68,8 @@ public class YearlyReport {

private Long closingStock;

private Timestamp itemEnteredDate;

@Override
public String toString() {

Expand Down
11 changes: 11 additions & 0 deletions src/main/java/com/iemr/inventory/service/report/CRMReportServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,9 @@ private StockDetailRow mapStockDetailRow(Object[] row) {
}

StockDetailRow detail = new StockDetailRow();
detail.entryType = text(row[2]);
detail.facilityName = text(row[3]);
detail.itemForm = text(row[4]);
detail.itemName = text(row[5]);
detail.strength = text(row[6]);
detail.uom = text(row[7]);
Expand Down Expand Up @@ -128,7 +130,9 @@ private Timestamp sqlTimestamp(Object value) {
}

private static class StockDetailRow {
private String entryType;
private String facilityName;
private String itemForm;
private String itemName;
private String strength;
private String uom;
Expand Down Expand Up @@ -301,7 +305,9 @@ public String getDailyStockDetailsReport(ItemStockEntryReport entryReport) {
DailyStockDetails stockDetail = new DailyStockDetails();
stockDetail.setSlNo(slNo++);
stockDetail.setDate(entryReport.getStartDate());
stockDetail.setEntryType(detail.entryType);
stockDetail.setFacilityName(detail.facilityName);
stockDetail.setItemForm(detail.itemForm);
stockDetail.setItemName(detail.itemName);
stockDetail.setItemCategory(detail.itemCategoryName);
stockDetail.setStrength(detail.strength);
Expand Down Expand Up @@ -440,7 +446,9 @@ public String getMonthlyReport(ItemStockEntryReport entryReport) {
stockDetail.setSlNo(slNo++);
stockDetail.setMonth(entryReport.getMonthName());
stockDetail.setYear(entryReport.getYear());
stockDetail.setEntryType(detail.entryType);
stockDetail.setFacilityName(detail.facilityName);
stockDetail.setItemForm(detail.itemForm);
stockDetail.setItemName(detail.itemName);
stockDetail.setItemCategory(detail.itemCategoryName);
stockDetail.setStrength(detail.strength);
Expand Down Expand Up @@ -497,7 +505,9 @@ public String getYearlyReport(ItemStockEntryReport entryReport) {
YearlyReport stockDetail = new YearlyReport();
stockDetail.setSlNo(slNo++);
stockDetail.setYear(entryReport.getYear());
stockDetail.setEntryType(detail.entryType);
stockDetail.setFacilityName(detail.facilityName);
stockDetail.setItemForm(detail.itemForm);
stockDetail.setItemName(detail.itemName);
stockDetail.setItemCategory(detail.itemCategoryName);
stockDetail.setStrength(detail.strength);
Expand All @@ -509,6 +519,7 @@ public String getYearlyReport(ItemStockEntryReport entryReport) {
stockDetail.setQuantityReceived(detail.quantityReceived);
stockDetail.setDispensedQuantity(detail.dispensedQuantity);
stockDetail.setClosingStock(detail.closingStock);
stockDetail.setItemEnteredDate(detail.itemEnteredDate);
stockDetail.setAdjustmentIssue(detail.adjustmentIssue);
stockDetail.setAdjustmentReceipt(detail.adjustmentReceipt);
list.add(stockDetail);
Expand Down
Loading