WebSVN – SmartDukaan – Diff – /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java

 				if (catalogIdAndQtyMap != null) {
 					inStockQty = (catalogIdAndQtyMap.get(entry.getKey()) == null) ? 0
 							: catalogIdAndQtyMap.get(entry.getKey());
+				}
+				int grnStockQty = grnPendingQty + inStockQty;
 				int totalQty = processingQty + grnPendingQty + inStockQty;
 				if (totalQty < minQty) {
 					int shortageQty = minQty - totalQty;
 					fm.setStoreCode(fofoStore.getCode());
 					fm.setStoreName(customRetailer.getBusinessName());
 					fm.setBrandName(item.get(0).getBrand());
 					fm.setModelName(item.get(0).getModelName());
 					fm.setModelNumber(item.get(0).getModelNumber());
+					fm.setGrnStockQty(grnStockQty);
+					fm.setPendingIndentQty(processingQty);
 					fm.setShortageQty(shortageQty);
 					fm.setPoAvailabitiy(allColorPoAvailability);
 					fm.setWarehouseName(warehouseMap.get(customRetailer.getWarehouseId()));
 					fm.setStateManager(partnerIdSalesHeadersMap.get(fofoId).getRegionalManager());
 					fm.setTerritoryManager(partnerIdSalesHeadersMap.get(fofoId).getTerritoryManager());
 					focusedModelShortageList.add(fm);
+				}
+			}
+			/*
-			if (!focusedModelShortageList.isEmpty()) {
+			 * if (!focusedModelShortageList.isEmpty()) { String subject = "Stock Alert";
-				String subject = "Stock Alert";
-				String messageText = this.getMessage(focusedModelShortageList);
+			 * String messageText = this.getMessage(focusedModelShortageList);
+			 *
-				this.sendMailWithAttachments(subject, messageText, customRetailer.getEmail());
+			 * this.sendMailWithAttachments(subject, messageText,
+			 * customRetailer.getEmail()); String notificationMessage =
-				String notificationMessage = this.getNotificationMessage(focusedModelShortageList);
+			 * this.getNotificationMessage(focusedModelShortageList);
+			 *
-				LOGGER.info("notificationMessage" + notificationMessage);
+			 * LOGGER.info("notificationMessage" + notificationMessage);
+			 *
-				SendNotificationModel sendNotificationModel = new SendNotificationModel();
+			 * SendNotificationModel sendNotificationModel = new SendNotificationModel();
-				sendNotificationModel.setCampaignName("Stock Alert");
+			 * sendNotificationModel.setCampaignName("Stock Alert");
-				sendNotificationModel.setTitle("Alert");
+			 * sendNotificationModel.setTitle("Alert");
-				sendNotificationModel.setMessage(notificationMessage);
+			 * sendNotificationModel.setMessage(notificationMessage);
-				sendNotificationModel.setType("url");
+			 * sendNotificationModel.setType("url"); sendNotificationModel.setUrl(
-				sendNotificationModel.setUrl("https://app.smartdukaan.com/pages/home/notifications");
+			 * "https://app.smartdukaan.com/pages/home/notifications");
-				sendNotificationModel.setExpiresat(LocalDateTime.now().plusDays(2));
+			 * sendNotificationModel.setExpiresat(LocalDateTime.now().plusDays(2));
-				sendNotificationModel.setMessageType(MessageType.notification);
+			 * sendNotificationModel.setMessageType(MessageType.notification); int userId =
-				int userId = userAccountRepository.selectUserIdByRetailerId(fofoId);
+			 * userAccountRepository.selectUserIdByRetailerId(fofoId);
-				sendNotificationModel.setUserIds(Arrays.asList(userId));
+			 * sendNotificationModel.setUserIds(Arrays.asList(userId));
-				notificationService.sendNotification(sendNotificationModel);
+			 * notificationService.sendNotification(sendNotificationModel);
+			 *
-			}
+			 * }
+			 */
+		}
 		if (!focusedModelShortageReportMap.isEmpty()) {
 			String fileName = "Stock Alert-" + FormattingUtils.formatDate(LocalDateTime.now()) + ".csv";
 			Map<String, Set<Integer>> storeGuyMap = csService.getAuthUserPartnerIdMapping();
 							emailRowsMap.put(y.getKey(), new ArrayList<>());
+						}
 						List<List<? extends Serializable>> fms = x.getValue().stream()
 								.map(r -> Arrays.asList(r.getStoreCode(), r.getStoreName(), r.getBrandName(),
 										r.getModelName(), r.getModelNumber(), r.getWarehouseName(), r.getStateManager(),
-										r.getTerritoryManager(), r.getShortageQty(), r.getAvailabitiy()))
+										r.getTerritoryManager(), r.getPendingIndentQty(), r.getGrnStockQty(),
+										r.getShortageQty(), r.getAvailabitiy()))
 								.collect(Collectors.toList());
 						emailRowsMap.get(y.getKey()).addAll(fms);
+					}
 				});
 			});
 			List<String> headers = Arrays.asList("Store Code", "Store Name", "Brand", "Model Name", "Model Number",
-					"Warehouse Name", "State Manager", "Territory Manager", "Shortage Qty", "Availability");
+					"Warehouse Name", "State Manager", "Territory Manager", "Pending Indent", "InStock", "Shortage Qty",
+					"Availability");
 			emailRowsMap.entrySet().forEach(entry -> {
 				ByteArrayOutputStream baos = null;
 				try {
 					baos = FileUtil.getCSVByteStream(headers, entry.getValue());
 				} catch (Exception e2) {
 					e2.printStackTrace();
+				}
-				String[] sendToArray = new String[] { entry.getKey() };
+				String[] sendToArray = new String[] { // entry.getKey()
+						"tejbeer.kaur@smartdukaan.com" };
 				try {
 					Utils.sendMailWithAttachment(googleMailSender, sendToArray, null, "Stock Alert", "PFA", fileName,
 							new ByteArrayResource(baos.toByteArray()));
 				} catch (Exception e1) { // TODO Auto-generated catch block
 					e1.printStackTrace();

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java – Rev 28467 → 28526