WebSVN – SmartDukaan – Diff – /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/InventoryAgeController.java

 			for(Long itemId : inventoryAvailabilityMap.keySet()){
-				if(itemId != 2287 ){
+				if(itemId!= 2287)
 					continue;
-				}
 				//System.out.println("Item Id Key : "+ itemId);
 				InventoryAvailability stockAvailability = inventoryAvailabilityMap.get(itemId);
 				long stockQuantity = stockAvailability.getQuantity();
 				logger.info("Item Id Key : "+ itemId + " Stock Quantity : "+ stockAvailability.getQuantity());
 				if(!client.isAlive()){
 					client = whClient.getClient();
+				}
 				List<InvAgeConsiderItems> invAgeConsiderItems = client.getInventoryAgeConsideredItems(itemId);
+				List<InvAgeConsiderItems> toBeIncludedInvAgeConsiderItems = new ArrayList<InvAgeConsiderItems>();
 				long freshCount = 0;
 				long oneToTwoCount = 0;
 				long twoToThreeCount = 0;
 				long threeToFourCount = 0;
 				if(invAgeConsiderItems==null || invAgeConsiderItems.size()==0){
 					continue;
+				}
 				double invAge = 0.0;
-				boolean breakInner = false;
 				for(InvAgeConsiderItems invItem : invAgeConsiderItems){
-					System.out.println("Inventory Item " + invItem.getId() + " Current Quantity : "+invItem.getCurrentQuantity());
-					invAge = invItem.getAge();
 					if(stockQuantity == invItem.getCurrentQuantity()){
+						toBeIncludedInvAgeConsiderItems.add(invItem);
-						breakInner = true;
+						break;
+					}
 					if(stockQuantity > invItem.getCurrentQuantity()){
+						toBeIncludedInvAgeConsiderItems.add(invItem);
 						stockQuantity = stockQuantity - invItem.getCurrentQuantity();
+						continue;
+					}
 					if(stockQuantity < invItem.getCurrentQuantity()){
 						invItem.setCurrentQuantity(stockQuantity);
+						toBeIncludedInvAgeConsiderItems.add(invItem);
-						breakInner = true;
+						break;
+					}
+				}
+				for(InvAgeConsiderItems invItem : toBeIncludedInvAgeConsiderItems){
 					if(invAge < 1){
 						freshCount = freshCount + invItem.getCurrentQuantity();
+					}
 					if(invAge >= 1 && invAge < 2){
 					zeroPlusCount = zeroPlusCount + invItem.getCurrentQuantity();
 					zeroPlusCost = zeroPlusCost + (invItem.getCost() * invItem.getCurrentQuantity());
-					if(breakInner)
-						break;
+				}
 				InventoryAge inventAge = new InventoryAge();
 				inventAge.setItemId(itemId);
 				inventAge.setBrand(brand);

Subversion Repositories SmartDukaan

(root)/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/InventoryAgeController.java – Rev 12849 → 12850