From cab72c3250406e204706c63307580a929fcc1159 Mon Sep 17 00:00:00 2001 From: Amoghavarsh <93114621+5Amogh@users.noreply.github.com> Date: Mon, 21 Jul 2025 11:57:11 +0530 Subject: [PATCH 1/6] Update version in pom.xml to 3.4.0 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index c82df79..886f3a3 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 com.iemr.inventory inventory-api - 3.1.0 + 3.4.0 war Inventory-API Inventory Page @@ -321,7 +321,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 + 3.4.0 process-resources From 4bdeb9ad2ffc13c2b3938ff6fe1f836b3c8c294a Mon Sep 17 00:00:00 2001 From: Amoghavarsh <93114621+5Amogh@users.noreply.github.com> Date: Mon, 21 Jul 2025 14:26:44 +0530 Subject: [PATCH 2/6] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 886f3a3..f23f68a 100644 --- a/pom.xml +++ b/pom.xml @@ -321,7 +321,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.4.0 + 3.1.0 process-resources From f4b84eae3530eec429a9cc6b9fa90bab87fc43d4 Mon Sep 17 00:00:00 2001 From: Vishwanath Balkur <118195001+vishwab1@users.noreply.github.com> Date: Sun, 10 Aug 2025 18:44:18 +0530 Subject: [PATCH 3/6] fix: removed db iemr (#97) --- .../com/iemr/inventory/repo/stockExit/PatientIssueRepo.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/iemr/inventory/repo/stockExit/PatientIssueRepo.java b/src/main/java/com/iemr/inventory/repo/stockExit/PatientIssueRepo.java index 6d6f82f..63a48a4 100644 --- a/src/main/java/com/iemr/inventory/repo/stockExit/PatientIssueRepo.java +++ b/src/main/java/com/iemr/inventory/repo/stockExit/PatientIssueRepo.java @@ -41,7 +41,7 @@ List findByFacilityIDAndCreatedDateBetweenOrderByCreatedDateDesc @Transactional @Modifying - @Query(value = " UPDATE db_iemr.i_ben_flow_outreach SET pharmacist_flag = 9, Processed = 'U' " + @Query(value = " UPDATE i_ben_flow_outreach SET pharmacist_flag = 9, Processed = 'U' " + " WHERE beneficiary_reg_id = :benRegID AND beneficiary_visit_code = :benVisitCode ", nativeQuery = true) public int updateBenStatusFlowAfterPharma(@Param("benRegID") Long benRegID, @Param("benVisitCode") Long benVisitCode); From 2dbe8f22ea2d736bee791950a65e3fe32182cb08 Mon Sep 17 00:00:00 2001 From: Vanitha S <116701245+vanitha1822@users.noreply.github.com> Date: Wed, 20 Aug 2025 15:34:50 +0530 Subject: [PATCH 4/6] fix: add logs (#100) --- .../service/stockEntry/StockEntryServiceImpl.java | 9 +++++++++ 1 file changed, 9 insertions(+) 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 4f1992b..5e13dc9 100644 --- a/src/main/java/com/iemr/inventory/service/stockEntry/StockEntryServiceImpl.java +++ b/src/main/java/com/iemr/inventory/service/stockEntry/StockEntryServiceImpl.java @@ -155,6 +155,15 @@ public List getItemStockFromItemID(Integer facilityID, List Date: Thu, 23 Oct 2025 12:55:56 +0530 Subject: [PATCH 5/6] fix: add strength in shortexpiry report --- .../com/iemr/inventory/repo/report/ItemStockReportRepo.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 af2885b..bb13624 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); From a5a8b88587d032d5de262819dde511a899572b2c Mon Sep 17 00:00:00 2001 From: Vanitha Date: Wed, 29 Oct 2025 10:53:10 +0530 Subject: [PATCH 6/6] fix: update pom.xml --- pom.xml | 2 +- .../service/stockEntry/StockEntryServiceImpl.java | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index f23f68a..ef49ffb 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/service/stockEntry/StockEntryServiceImpl.java b/src/main/java/com/iemr/inventory/service/stockEntry/StockEntryServiceImpl.java index 5e13dc9..1cc756b 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