Inventory item batch list fetch condition modified (#53)

* Added deleted flag condition for fetching short expiry report * Removed itembatch list quantity check condition --------- Co-authored-by: Devika <[email protected]>
PSMRI · Jun 3, 2024 · 428c95b · 428c95b
1 parent 3891b7c
commit 428c95b
Showing 1 changed file with 7 additions and 21 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
@@ -202,38 +202,24 @@ public List<AllocateItemMap> getItemStockFromItemID(Integer facilityID, List<Ite
 				if (totalQty >= itemStockExit.getQuantity()) {
 					stock.setQuantity(stock.getQuantityInHand() - totalQty + itemStockExit.getQuantity());
 					break;
-				} else if (totalQty < itemStockExit.getQuantity()) {
-					logger.info("Insufficent Qty for '" + item.getItemName() + "'. Available Qty is : " + totalQty);
-					break;			
+
 				}
 
 			}
-//			if (totalQty < itemStockExit.getQuantity()) {
-//				throw new InventoryException(
-//						"Insufficent Qty for '" + item.getItemName() + "'. Available Qty is : " + totalQty);
-//
-//			}
+			if (totalQty < itemStockExit.getQuantity()) {
+				throw new InventoryException(
+						"Insufficent Qty for '" + item.getItemName() + "'. Available Qty is : " + totalQty);
+
+			}
 
 			List<ItemBatchList> stockBatch = itemBatchListMap.getItemStockExitMapList(itemStockList);
-//			if(stockBatch != null && stockBatch.size() > 0) {
 			for (ItemBatchList objList : stockBatch) {
 				if (objList.getExpiryDate() != null)
 					objList.setExpiresIn(calculateExpiryDateInDays(new Timestamp(objList.getExpiryDate().getTime())));
 			}
 			allocateItemMap.setItemBatchList(stockBatch);
 			allocateItemMapList.add(allocateItemMap);
-//			} else {
-//				ItemBatchList obj = new ItemBatchList();
-//				obj.setQuantity(0);
-//				obj.setQuantityInHand(0);
-//				obj.setItemID(itemID);
-//				obj.setFacilityID(facilityID);
-//				
-//				List<ItemBatchList> stockbatchList = new ArrayList<>();
-//				stockbatchList.add(obj);
-//				allocateItemMap.setItemBatchList(stockbatchList);
-//				allocateItemMapList.add(allocateItemMap);
-//			}
+
 
 		}