From 0151c4256636408675d6eea4391091c4c37eed53 Mon Sep 17 00:00:00 2001 From: Vanitha S <116701245+vanitha1822@users.noreply.github.com> Date: Wed, 29 Oct 2025 11:40:16 +0530 Subject: [PATCH 1/4] Add "Strength" field in Short Expiry report (#103) * Update version in pom.xml to 3.4.0 * Update pom.xml * fix: removed db iemr (#97) * fix: add logs (#100) * fix: add strength in shortexpiry report * fix: update pom.xml --------- Co-authored-by: Amoghavarsh <93114621+5Amogh@users.noreply.github.com> Co-authored-by: Vishwanath Balkur <118195001+vishwab1@users.noreply.github.com> Co-authored-by: vishwab1 Co-authored-by: Mithun James --- pom.xml | 2 +- .../iemr/inventory/repo/report/ItemStockReportRepo.java | 4 ++-- .../service/stockEntry/StockEntryServiceImpl.java | 8 -------- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index f23f68a5..ef49ffb4 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 com.iemr.inventory inventory-api - 3.4.0 + 3.5.0 war Inventory-API Inventory Page diff --git a/src/main/java/com/iemr/inventory/repo/report/ItemStockReportRepo.java b/src/main/java/com/iemr/inventory/repo/report/ItemStockReportRepo.java index af2885b3..bb136245 100644 --- a/src/main/java/com/iemr/inventory/repo/report/ItemStockReportRepo.java +++ b/src/main/java/com/iemr/inventory/repo/report/ItemStockReportRepo.java @@ -99,11 +99,11 @@ List getDailyStockDetailReportByFacilityID(@Param("startDate") Date st List getDailyStockSummaryReportByFacilityID(@Param("startDate") Date startDate, @Param("endDate") Date endDate, @Param("facilityID") Integer facilityID); - @Query(value="Select distinct FacilityName, ItemName, ItemCategoryName, BatchNo, UnitCostPrice, ExpiryDate, QuantityInHand from db_reporting.fact_itemstockentry " + @Query(value="Select distinct FacilityName, ItemName, ItemCategoryName, Strength, BatchNo, UnitCostPrice, ExpiryDate, QuantityInHand from db_reporting.fact_itemstockentry " + "where ExpiryDate >= :startDate and ExpiryDate <= adddate(:startDate,AlertBeforeDays) and Deleted=false order by ExpiryDate asc",nativeQuery=true) List getShortExpiryReport(@Param("startDate") Date startDate); - @Query(value="Select distinct FacilityName, ItemName, ItemCategoryName, BatchNo, UnitCostPrice, ExpiryDate, QuantityInHand from db_reporting.fact_itemstockentry " + @Query(value="Select distinct FacilityName, ItemName, ItemCategoryName, Strength, BatchNo, UnitCostPrice, ExpiryDate, QuantityInHand from db_reporting.fact_itemstockentry " + "where ExpiryDate >= :startDate and ExpiryDate <= adddate(:startDate,AlertBeforeDays) and FacilityID = :facilityID and Deleted=false order by ExpiryDate asc",nativeQuery=true) List getShortExpiryReportByFacilityID(@Param("startDate") Date startDate, @Param("facilityID") Integer facilityID); diff --git a/src/main/java/com/iemr/inventory/service/stockEntry/StockEntryServiceImpl.java b/src/main/java/com/iemr/inventory/service/stockEntry/StockEntryServiceImpl.java index 5e13dc91..1cc756b0 100644 --- a/src/main/java/com/iemr/inventory/service/stockEntry/StockEntryServiceImpl.java +++ b/src/main/java/com/iemr/inventory/service/stockEntry/StockEntryServiceImpl.java @@ -155,14 +155,6 @@ public List getItemStockFromItemID(Integer facilityID, List Date: Wed, 29 Oct 2025 12:09:18 +0530 Subject: [PATCH 2/4] fix: add log --- .../inventory/service/stockEntry/StockEntryServiceImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/com/iemr/inventory/service/stockEntry/StockEntryServiceImpl.java b/src/main/java/com/iemr/inventory/service/stockEntry/StockEntryServiceImpl.java index 1cc756b0..ae5247ad 100644 --- a/src/main/java/com/iemr/inventory/service/stockEntry/StockEntryServiceImpl.java +++ b/src/main/java/com/iemr/inventory/service/stockEntry/StockEntryServiceImpl.java @@ -148,14 +148,13 @@ public List getItemStockFromItemID(Integer facilityID, List allocateItemMapList = new ArrayList(); - + logger.info("ItemStockExitList Size:" + itemStockExitList.size()); for (ItemStockExit itemStockExit : itemStockExitList) { AllocateItemMap allocateItemMap = new AllocateItemMap(); List itemStockList = new ArrayList(); ItemMaster item = itemService.getItemMasterCatByID(itemStockExit.getItemID()); - allocateItemMap.setFacilityID(item.getFacilityID()); allocateItemMap.setItemID(item.getItemID()); allocateItemMap.setItemName(item.getItemName()); From 4b49c9b426139a1b4c7ae0b5fe7d2fe401c81cd9 Mon Sep 17 00:00:00 2001 From: Vanitha S <116701245+vanitha1822@users.noreply.github.com> Date: Thu, 30 Oct 2025 16:06:06 +0530 Subject: [PATCH 3/4] fix: add strength field in the report (#104) --- pom.xml | 20 +++++++++++++---- .../mapper/report/InventoryReportMapper.java | 1 + .../inventory/model/report/ExpiryReport.java | 5 ++++- .../service/report/CRMReportServiceImpl.java | 22 ++++++++++++++----- 4 files changed, 37 insertions(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index ef49ffb4..b8dcce96 100644 --- a/pom.xml +++ b/pom.xml @@ -111,11 +111,11 @@ jersey-media-multipart 2.0-m11 - + org.springframework.boot spring-boot-starter-test @@ -215,14 +215,26 @@ org.springframework.boot spring-boot-starter - + + + org.slf4j + slf4j-api + ${slf4j.version} + + + org.slf4j + slf4j-simple + ${slf4j.version} + + + org.springframework.plugin spring-plugin-core diff --git a/src/main/java/com/iemr/inventory/mapper/report/InventoryReportMapper.java b/src/main/java/com/iemr/inventory/mapper/report/InventoryReportMapper.java index 712dd834..5347151a 100644 --- a/src/main/java/com/iemr/inventory/mapper/report/InventoryReportMapper.java +++ b/src/main/java/com/iemr/inventory/mapper/report/InventoryReportMapper.java @@ -53,6 +53,7 @@ public interface InventoryReportMapper { @Mappings({ @Mapping(target = "facilityName", expression = "java(entryReport.getFacilityName())"), @Mapping(target = "itemName", expression = "java(entryReport.getItemName())"), @Mapping(target = "itemCategory", expression = "java(entryReport.getItemCategoryName())"), + @Mapping(target = "strength", expression = "java(entryReport.getStrength())"), @Mapping(target = "batchNo", expression = "java(entryReport.getBatchNo())"), @Mapping(target = "unitCostPrice", expression = "java(entryReport.getUnitCostPrice())"), @Mapping(target = "expiryDate", expression = "java(entryReport.getExpiryDate())"), diff --git a/src/main/java/com/iemr/inventory/model/report/ExpiryReport.java b/src/main/java/com/iemr/inventory/model/report/ExpiryReport.java index addf157d..b1abd401 100644 --- a/src/main/java/com/iemr/inventory/model/report/ExpiryReport.java +++ b/src/main/java/com/iemr/inventory/model/report/ExpiryReport.java @@ -40,6 +40,8 @@ public class ExpiryReport { private String itemCategory; + private String strength; + private String batchNo; private Double unitCostPrice; @@ -52,12 +54,13 @@ public ExpiryReport() { } - public ExpiryReport(String facilityName, String itemName, String itemCategory, String batchNo, Double unitCostPrice, + public ExpiryReport(String facilityName, String itemName, String itemCategory, String Strength, String batchNo, Double unitCostPrice, Date expiryDate, Integer quantityInHand) { this.facilityName = facilityName; this.itemName = itemName; this.itemCategory = itemCategory; + this.strength = Strength; this.batchNo = batchNo; this.unitCostPrice = unitCostPrice; this.expiryDate = expiryDate; diff --git a/src/main/java/com/iemr/inventory/service/report/CRMReportServiceImpl.java b/src/main/java/com/iemr/inventory/service/report/CRMReportServiceImpl.java index 714043b7..209ce571 100644 --- a/src/main/java/com/iemr/inventory/service/report/CRMReportServiceImpl.java +++ b/src/main/java/com/iemr/inventory/service/report/CRMReportServiceImpl.java @@ -27,6 +27,8 @@ import java.util.Calendar; import java.util.List; import java.util.Objects; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -57,6 +59,8 @@ public class CRMReportServiceImpl implements CRMReportService { @Autowired(required=false) InventoryReportMapper mapper; + private Logger logger = LoggerFactory.getLogger(this.getClass().getSimpleName()); + @Override public String getInwardStockReport(ItemStockEntryReport entryReport) { @@ -98,9 +102,10 @@ public String getExpiryReport(ItemStockEntryReport entryReport) { object[1] != null ? object[1].toString() : null, object[2] != null ? object[2].toString() : null, object[3] != null ? object[3].toString() : null, - object[4] != null ? Double.valueOf(object[4].toString()) : null, - (Date) (object[5] != null ? object[5] : null), - (Integer) (object[6] != null ? object[6] : null)); + object[4] != null ? object[4].toString() : null, + object[5] != null ? Double.valueOf(object[5].toString()) : null, + (Date) (object[6] != null ? object[6] : null), + (Integer) (object[7] != null ? object[7] : null)); report.setSlNo(slNo++); reportList.add(report); @@ -618,6 +623,10 @@ public String getShortExpiryReport(ItemStockEntryReport entryReport) { list = itemStockReportRepo.getShortExpiryReport(startExpiry); } + logger.info("Short Expiry Report Start Date: " + startExpiry + " End Date: " + endExpiry); + + logger.info("Short Expiry Report List Size: " + list.size()); + Long slNo = 1L; for (Object[] object : list) { @@ -627,9 +636,10 @@ public String getShortExpiryReport(ItemStockEntryReport entryReport) { object[1] != null ? object[1].toString() : null, object[2] != null ? object[2].toString() : null, object[3] != null ? object[3].toString() : null, - object[4] != null ? ((BigDecimal) object[4]).doubleValue() : null, - (Date) (object[5] != null ? object[5] : null), - (Integer) (object[6] != null ? object[6] : null)); + object[4] != null ? object[4].toString() : null, + object[5] != null ? ((BigDecimal) object[5]).doubleValue() : null, + (Date) (object[6] != null ? object[6] : null), + (Integer) (object[7] != null ? object[7] : null)); report.setSlNo(slNo++); reportList.add(report); From a4a0782c3be4a491416e34aa8c1ba867b2d30704 Mon Sep 17 00:00:00 2001 From: Vanitha Date: Thu, 30 Oct 2025 16:38:58 +0530 Subject: [PATCH 4/4] fix: check by add logs --- .../iemr/inventory/controller/report/CRMReportController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/iemr/inventory/controller/report/CRMReportController.java b/src/main/java/com/iemr/inventory/controller/report/CRMReportController.java index 39c891da..3627768d 100644 --- a/src/main/java/com/iemr/inventory/controller/report/CRMReportController.java +++ b/src/main/java/com/iemr/inventory/controller/report/CRMReportController.java @@ -211,7 +211,7 @@ public String getShortExpiryReport(@RequestBody String request) { ItemStockEntryReport report = InputMapper.gson().fromJson(request, ItemStockEntryReport.class); String res = crmReportService.getShortExpiryReport(report); response.setResponse(res); - logger.info("getShortExpiryReport response " + response.toString()); + logger.info("Short Expiry Report response:" + response.toString()); } catch (Exception e) { logger.error(e.getMessage()); response.setError(e);