WebSVN – SmartDukaan – Diff – /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/InventoryController.java

 		poModel.setThreedaysValue(poThreedaysValue);
 		poModel.setSevendaysValue(poSevendaysValue);
 		poModel.setSevendaysQty(poSevendaysQty);
 		poModel.setThreedaysQty(poThreedaysQty);
 		poModel.setTodayQty(poTodayQty);
 		openPO.add(poModel);
 		long purtodayValue = 0;
 		long purthreedaysValue = 0;
-		long purfifteendaysValue = 0;
+		long purlmsValue = 0;
 		long purmtd = 0;
 		long purtodayQty = 0;
 		long purthreedaysQty = 0;
-		long purfifteendaysQty = 0;
+		long purlmsQty = 0;
 		long purmtdQty = 0;
 		List<OurPurchaseModel> purchase = warehouseScanRepository.selectOurPurchase(warehouseIds);
 		for (OurPurchaseModel pm : purchase) {
 			purtodayValue += pm.getTodayValue();
 			purthreedaysValue += pm.getThreedaysValue();
-			purfifteendaysValue += pm.getFifteendaysValue();
+			purlmsValue += pm.getLms();
 			purmtd += pm.getMtd();
 			purtodayQty += pm.getTodayQty();
-			poThreedaysQty += pm.getThreedaysQty();
+			purthreedaysQty += pm.getThreedaysQty();
-			purfifteendaysQty += pm.getFifteendaysQty();
+			purlmsQty += pm.getLmsQty();
 			purmtdQty += pm.getMtdQty();
+		}
 		OurPurchaseModel omp = new OurPurchaseModel();
 		omp.setBrand("Total Values");
 		omp.setTodayValue(purtodayValue);
 		omp.setThreedaysValue(purthreedaysValue);
-		omp.setFifteendaysValue(purfifteendaysValue);
+		omp.setLms(purlmsValue);
 		omp.setMtd(purmtd);
 		omp.setTodayQty(purtodayQty);
 		omp.setThreedaysQty(purthreedaysQty);
-		omp.setFifteendaysQty(purfifteendaysQty);
+		omp.setLmsQty(purlmsQty);
 		omp.setMtdQty(purmtdQty);
 		purchase.add(omp);
 		List<BrandWiseTertiaryModel> tertiary = fofoOrderRepository.selectGroupByBrandPartnerTertiary(warehouseIds);
 		long tertodayValue = 0;
 		long terthreedaysValue = 0;
 		long termtd = 0;
 		long terlmtd = 0;
+		long terlms = 0;
 		long tertodayQty = 0;
 		long terthreedaysQty = 0;
 		long termtdQty = 0;
 		long terlmtdQty = 0;
+		long terlmsQty = 0;
 		for (BrandWiseTertiaryModel btm : tertiary) {
 			tertodayValue += btm.getTodayValue();
 			terthreedaysValue += btm.getThreedaysValue();
 			termtd += btm.getMtd();
 			terlmtd += btm.getLmtd();
+			terlms += btm.getLms();
 			tertodayQty += btm.getTodayQty();
 			terthreedaysQty += btm.getThreedaysQty();
 			termtdQty += btm.getMtdQty();
 			terlmtdQty += btm.getLmtdQty();
+			terlmsQty += btm.getLmsQty();
+		}
 		BrandWiseTertiaryModel bwt = new BrandWiseTertiaryModel();
 		bwt.setBrand("Total Values");
 		bwt.setTodayValue(tertodayValue);
 		bwt.setThreedaysValue(terthreedaysValue);
 		bwt.setMtd(termtd);
 		bwt.setLmtd(terlmtd);
+		bwt.setLms(terlms);
 		bwt.setTodayQty(tertodayQty);
 		bwt.setThreedaysQty(terthreedaysQty);
 		bwt.setMtdQty(termtdQty);
 		bwt.setLmtdQty(terlmtdQty);
+		bwt.setLmsQty(terlmsQty);
 		tertiary.add(bwt);
 		List<SecondaryOrderBillingModel> billing = orderRepository.selectAllBilledOrderGroupByBrand(warehouseIds);
 		long sectodayValue = 0;
 		long secthreedaysValue = 0;
 		long secmtd = 0;
 		long seclmtd = 0;
+		long seclms = 0;
 		long sectodayQty = 0;
 		long secthreedaysQty = 0;
 		long secmtdQty = 0;
 		long seclmtdQty = 0;
+		long seclmsQty = 0;
 		for (SecondaryOrderBillingModel sbm : billing) {
 			sectodayValue += sbm.getTodayValue();
 			secthreedaysValue += sbm.getThreedaysValue();
 			secmtd += sbm.getMtd();
 			seclmtd += sbm.getLmtd();
+			seclms += sbm.getLms();
 			sectodayQty += sbm.getTodayQty();
 			secthreedaysQty += sbm.getThreedaysQty();
 			secmtdQty += sbm.getMtdQty();
 			seclmtdQty += sbm.getLmtdQty();
+			seclmsQty += sbm.getLmsQty();
+		}
 		SecondaryOrderBillingModel som = new SecondaryOrderBillingModel();
 		som.setBrand("Total Values");
 		som.setTodayValue(sectodayValue);
 		som.setThreedaysValue(secthreedaysValue);
 		som.setMtd(secmtd);
 		som.setLmtd(seclmtd);
+		som.setLms(seclms);
 		som.setTodayQty(sectodayQty);
 		som.setThreedaysQty(secthreedaysQty);
 		som.setMtdQty(secmtdQty);
 		som.setLmtdQty(seclmtdQty);
+		som.setLmsQty(seclmsQty);
 		billing.add(som);
 		LOGGER.info("openPO" + openPO);
 		LOGGER.info("purchase" + purchase);
 		LOGGER.info("tertiary" + tertiary);
 		LOGGER.info("billing" + billing);
+	}
 	@RequestMapping(value = "/getOpenPoItemByBrand", method = RequestMethod.GET)
 	public String Inventory(HttpServletRequest request,
 			@RequestParam(name = "warehouseIds", required = true, defaultValue = "0") List<Integer> warehouseIds,
+			@RequestParam(name = "brand", required = true, defaultValue = "") List<String> brand, int timeValue,
-			String brand, int timeValue, Model model) throws Exception {
+			Model model) throws Exception {
 		model.addAttribute("warehouseId", warehouseIds);
 		LOGGER.info("warehouseIds" + warehouseIds);
 		Map<Integer, String> warehouseMap = ProfitMandiConstants.WAREHOUSE_MAP;
 		if (warehouseIds.contains(0)) {
 			warehouseIds.addAll(warehouseMap.keySet());
+		}
+		LOGGER.info("brand" + brand);
+		if (brand.contains("Total Values")) {
+			List<String> poBrands = warehousePurchaseOrderRepository.selectOpenPol(warehouseIds).stream()
+					.map(x -> x.getBrand()).collect(Collectors.toList());
+			brand.addAll(poBrands);
+		}
+		LOGGER.info("brand" + brand);
 		LocalDateTime curDate = LocalDate.now().atStartOfDay();
 		List<OpenPoItemModel> openPOItem = null;
 		if (timeValue != 0) {
 			openPOItem = warehousePurchaseOrderRepository.selectOpenPoItem(warehouseIds, brand,
 					curDate.minusDays(timeValue), curDate);
+	}
 	@RequestMapping(value = "/getOurPurchaseItemByBrand", method = RequestMethod.GET)
 	public String getOurPurchaseItemByBrand(HttpServletRequest request,
 			@RequestParam(name = "warehouseIds", required = true, defaultValue = "0") List<Integer> warehouseIds,
+			@RequestParam(name = "brand", required = true, defaultValue = "") List<String> brand, int timeValue,
-			String brand, int timeValue, Model model) throws Exception {
+			Model model) throws Exception {
 		model.addAttribute("warehouseId", warehouseIds);
 		LOGGER.info("warehouseIds" + warehouseIds);
 		Map<Integer, String> warehouseMap = ProfitMandiConstants.WAREHOUSE_MAP;
 		if (warehouseIds.contains(0)) {
 			warehouseIds.addAll(warehouseMap.keySet());
+		}
 		LocalDateTime curDate = LocalDate.now().atStartOfDay();
+		if (brand.contains("Total Values")) {
+			List<String> purchasebrands = warehouseScanRepository.selectOurPurchase(warehouseIds).stream()
+					.map(x -> x.getBrand()).collect(Collectors.toList());
+			brand.addAll(purchasebrands);
+		}
 		List<OurPurchaseItemModel> ourPurchaseItem = null;
 		if (timeValue != 0) {
-			if (timeValue != 1) {
+			if (timeValue == 1) {
 				ourPurchaseItem = warehouseScanRepository.selectOurPurchaseItemByBrand(warehouseIds, brand,
-						curDate.minusDays(timeValue), curDate);
+						curDate.withDayOfMonth(1), curDate.plusDays(1));
+			} else if (timeValue == -1) {
+				ourPurchaseItem = warehouseScanRepository.selectOurPurchaseItemByBrand(warehouseIds, brand,
+						curDate.minusMonths(1).withDayOfMonth(1), curDate.withDayOfMonth(1));
 			} else {
 				ourPurchaseItem = warehouseScanRepository.selectOurPurchaseItemByBrand(warehouseIds, brand,
-						curDate.withDayOfMonth(1), curDate.plusDays(1));
+						curDate.minusDays(timeValue), curDate);
+			}
 		} else {
 			ourPurchaseItem = warehouseScanRepository.selectTodayOurPurchaseItemByBrand(warehouseIds, brand, curDate);
+		}
 		LOGGER.info("ourPurchaseItem" + ourPurchaseItem);
 		model.addAttribute("ourPurchaseItem", ourPurchaseItem);
+		model.addAttribute("warehouseMap", warehouseMap);
 		return "inventory-listing-purchase-item";
+	}
 	@RequestMapping(value = "/getSecondaryBillingItemByBrand", method = RequestMethod.GET)
 	public String getSecondaryBillingItemByBrand(HttpServletRequest request,
 			@RequestParam(name = "warehouseIds", required = true, defaultValue = "0") List<Integer> warehouseIds,
+			@RequestParam(name = "brand", required = true, defaultValue = "") List<String> brand, int timeValue,
-			String brand, int timeValue, Model model) throws Exception {
+			Model model) throws Exception {
 		model.addAttribute("warehouseId", warehouseIds);
 		LOGGER.info("warehouseIds" + warehouseIds);
 		Map<Integer, String> warehouseMap = ProfitMandiConstants.WAREHOUSE_MAP;
 		if (warehouseIds.contains(0)) {
 			warehouseIds.addAll(warehouseMap.keySet());
+		}
 		LocalDateTime curDate = LocalDate.now().atStartOfDay();
+		int dayOfMonth = curDate.getDayOfMonth();
+		LocalDateTime startOfMonth = curDate.withDayOfMonth(1);
+		int lengthOfMonth = YearMonth.from(startOfMonth.minusMonths(1)).lengthOfMonth();
+		if (brand.contains("Total Values")) {
+			List<String> billingbrands = orderRepository.selectAllBilledOrderGroupByBrand(warehouseIds).stream()
+					.map(x -> x.getBrand()).collect(Collectors.toList());
+			brand.addAll(billingbrands);
+		}
 		List<SecondaryOrderItemBillingModel> billedItem = null;
 		if (timeValue != 0) {
 			if (timeValue == 1) {
 				billedItem = orderRepository.selectAllBilledOrderItemByBrand(warehouseIds, brand,
 						curDate.withDayOfMonth(1), curDate.plusDays(1));
 			} else if (timeValue == 2) {
+				LOGGER.info("curDate" + curDate.withDayOfMonth(1).minusMonths(1));
+				LOGGER.info("curDate" + curDate.minusMonths(1).plusDays(Math.min(dayOfMonth, lengthOfMonth)));
 				billedItem = orderRepository.selectAllBilledOrderItemByBrand(warehouseIds, brand,
 						curDate.withDayOfMonth(1).minusMonths(1),
+						startOfMonth.minusMonths(1).plusDays(Math.min(dayOfMonth, lengthOfMonth)));
+			} else if (timeValue == -1) {
+				billedItem = orderRepository.selectAllBilledOrderItemByBrand(warehouseIds, brand,
-						curDate.with(LocalTime.MAX).minusMonths(1).plusDays(1));
+						curDate.minusMonths(1).withDayOfMonth(1), startOfMonth);
 			} else {
 				billedItem = orderRepository.selectAllBilledOrderItemByBrand(warehouseIds, brand,
 						curDate.minusDays(timeValue), curDate);
+			}
 		} else {
+	}
 	@RequestMapping(value = "/getPartnerTertiaryItemByBrand", method = RequestMethod.GET)
 	public String getPartnerTertiaryItemByBrand(HttpServletRequest request,
 			@RequestParam(name = "warehouseIds", required = true, defaultValue = "0") List<Integer> warehouseIds,
+			@RequestParam(name = "brand", required = true, defaultValue = "") List<String> brand, int timeValue,
-			String brand, int timeValue, Model model) throws Exception {
+			Model model) throws Exception {
 		model.addAttribute("warehouseId", warehouseIds);
 		LOGGER.info("warehouseIds" + warehouseIds);
 		Map<Integer, String> warehouseMap = ProfitMandiConstants.WAREHOUSE_MAP;
 		if (warehouseIds.contains(0)) {
 			warehouseIds.addAll(warehouseMap.keySet());
+		}
 		LocalDateTime curDate = LocalDate.now().atStartOfDay();
 		int dayOfMonth = curDate.getDayOfMonth();
 		LocalDateTime startOfMonth = curDate.withDayOfMonth(1);
-		int lengthOfMonth = YearMonth.from(startOfMonth).lengthOfMonth();
+		int lengthOfMonth = YearMonth.from(startOfMonth.minusMonths(1)).lengthOfMonth();
+		if (brand.contains("Total Values")) {
+			List<String> tertiaryBrands = fofoOrderRepository.selectGroupByBrandPartnerTertiary(warehouseIds).stream()
+					.map(x -> x.getBrand()).collect(Collectors.toList());
+			brand.addAll(tertiaryBrands);
+		}
 		List<BrandItemWiseTertiaryModel> tertiaryItem = null;
 		if (timeValue != 0) {
 			if (timeValue == 1) {
 				tertiaryItem = fofoOrderRepository.selectItemPartnerTertiaryByBrand(warehouseIds, brand,
 						curDate.withDayOfMonth(1), curDate.plusDays(1));
 			} else if (timeValue == 2) {
-				LOGGER.info("curDate" + curDate.withDayOfMonth(1).minusMonths(1));
+				LOGGER.info("curDate" + startOfMonth.minusMonths(1));
-				LOGGER.info("curDate" + curDate.minusMonths(1).plusDays(Math.min(dayOfMonth, lengthOfMonth)));
+				LOGGER.info("curDate" + startOfMonth.minusMonths(1).plusDays(Math.min(dayOfMonth, lengthOfMonth)));
 				tertiaryItem = fofoOrderRepository.selectItemPartnerTertiaryByBrand(warehouseIds, brand,
-						curDate.withDayOfMonth(1).minusMonths(1),
+						startOfMonth.minusMonths(1),
 						startOfMonth.minusMonths(1).plusDays(Math.min(dayOfMonth, lengthOfMonth)));
+			} else if (timeValue == -1) {
+				LOGGER.info("date" + curDate.minusMonths(1).withDayOfMonth(1));
+				LOGGER.info("date" + curDate.minusMonths(1).withDayOfMonth(lengthOfMonth).plusDays(1));
+				tertiaryItem = fofoOrderRepository.selectItemPartnerTertiaryByBrand(warehouseIds, brand,
+						curDate.minusMonths(1).withDayOfMonth(1), startOfMonth);
 			} else {
 				tertiaryItem = fofoOrderRepository.selectItemPartnerTertiaryByBrand(warehouseIds, brand,
 						curDate.minusDays(timeValue), curDate);
+			}

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/InventoryController.java – Rev 27739 → 27749