Subversion Repositories SmartDukaan

Rev

Rev 27591 | Rev 27599 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 27591 Rev 27594
Line 792... Line 792...
792 
			Map<Integer, WarehouseWiseStockModel> warehouseStockMap = new HashMap<>();
 792 
			Map<Integer, WarehouseWiseStockModel> warehouseStockMap = new HashMap<>();
793 
			Map<Integer, String> warehouseMap = ProfitMandiConstants.WAREHOUSE_MAP;
 793 
			Map<Integer, String> warehouseMap = ProfitMandiConstants.WAREHOUSE_MAP;
794 
			LinkedHashMap<Integer, String> wm = new LinkedHashMap<Integer, String>();
 794 
			LinkedHashMap<Integer, String> wm = new LinkedHashMap<Integer, String>();
795 
 
 795 
 
796 
			List<BrandWisePartnerSaleModel> partnersBrandSale = null;
 796 
			List<BrandWisePartnerSaleModel> partnersBrandSale = null;
- 
 
 797 
 
- 
 
 798 
			List<BrandWisePartnerSaleModel> accessoriesBrandSales = null;
797 
			for (Map.Entry<Integer, String> entry : warehouseMap.entrySet()) {
 799 
			for (Map.Entry<Integer, String> entry : warehouseMap.entrySet()) {
798 
				wm.put(entry.getKey(), entry.getValue());
 800 
				wm.put(entry.getKey(), entry.getValue());
799 
			}
 801 
			}
800 
 
 802 
 
801 
			wm.put(0, "Total Values");
 803 
			wm.put(0, "Total Values");
Line 834... Line 836...
834 
					}
 836 
					}
835 
 
 837 
 
836 
					warehousePartnerDetailMap = this.getWarehousePartnerDetail();
 838 
					warehousePartnerDetailMap = this.getWarehousePartnerDetail();
837 
					rct = reporticoCacheTableRepository.selectByTableName("SaholicInventoryCIS");
 839 
					rct = reporticoCacheTableRepository.selectByTableName("SaholicInventoryCIS");
838 
					partnersBrandSale = fofoStoreRepository.selectGroupByBrandWarehousePartnerSale();
 840 
					partnersBrandSale = fofoStoreRepository.selectGroupByBrandWarehousePartnerSale();
- 
 
 841 
					accessoriesBrandSales = fofoStoreRepository.selectGroupByBrandAccesoriesWarehousePartnerSale();
839 
				}
 842 
				}
840 
			}
 843 
			}
841 
 
 844 
 
842 
			if (Arrays.asList("amit.gupta@shop2020.in", "tejbeer.kaur@shop2020.in", "manish.tiwari@smartdukaan.com")
 845 
			if (Arrays.asList("amit.gupta@shop2020.in", "tejbeer.kaur@shop2020.in", "manish.tiwari@smartdukaan.com")
843 
					.contains(email)) {
 846 
					.contains(email)) {
Line 884... Line 887...
884 
			model.addAttribute("warehousePartnerDetailMap", warehousePartnerDetailMap);
 887 
			model.addAttribute("warehousePartnerDetailMap", warehousePartnerDetailMap);
885 
			model.addAttribute("warehouseMap", wm);
 888 
			model.addAttribute("warehouseMap", wm);
886 
			model.addAttribute("warehouseStockMap", warehouseStockMap);
 889 
			model.addAttribute("warehouseStockMap", warehouseStockMap);
887 
			model.addAttribute("brandSales", partnersBrandSale);
 890 
			model.addAttribute("brandSales", partnersBrandSale);
888 
 
 891 
 
- 
 
 892 
			model.addAttribute("accessoriesBrandSales", accessoriesBrandSales);
- 
 
 893 
 
889 
		} catch (ProfitMandiBusinessException e) {
 894 
		} catch (ProfitMandiBusinessException e) {
890 
		}
 895 
		}
891 
		List<Menu> menuList = (menus != null) ? this.prepareMenu(menus) : new ArrayList<>();
 896 
		List<Menu> menuList = (menus != null) ? this.prepareMenu(menus) : new ArrayList<>();
892 
		LOGGER.info("menu" + menuList);
 897 
		LOGGER.info("menu" + menuList);
893 
		model.addAttribute("menu", menuList);
 898 
		model.addAttribute("menu", menuList);
Line 1108... Line 1113...
1108 
 
 1113 
 
1109 
		LOGGER.info("warehouseWiseBrandPartnerSales" + warehouseWiseBrandPartnerSales);
 1114 
		LOGGER.info("warehouseWiseBrandPartnerSales" + warehouseWiseBrandPartnerSales);
1110 
		return "warehousewise_brand_partners_sale";
 1115 
		return "warehousewise_brand_partners_sale";
1111 
	}
 1116 
	}
1112 
 
 1117 
 
- 
 
 1118 
	@RequestMapping(value = "/getWarehouseWiseAccesoriesBrandPartnerSale", method = RequestMethod.GET)
- 
 
 1119 
	public String getWarehouseWiseAccesoriesBrandPartnerSale(HttpServletRequest request, Model model,
- 
 
 1120 
			@RequestParam String brand) throws Exception {
- 
 
 1121 
		List<WarehouseWiseBrandSaleModel> warehouseWiseBrandPartnerSales = fofoStoreRepository
- 
 
 1122 
				.selectGroupByWarehouseAccesoriesBrandWisePartnerSale(brand);
- 
 
 1123 
		Map<Integer, String> warehouseMap = ProfitMandiConstants.WAREHOUSE_MAP;
- 
 
 1124 
 
- 
 
 1125 
		Set<String> brands = inventoryService.getAllTagListingBrands();
- 
 
 1126 
		model.addAttribute("warehouseWiseBrandPartnerSales", warehouseWiseBrandPartnerSales);
- 
 
 1127 
		model.addAttribute("warehouseMap", warehouseMap);
- 
 
 1128 
		model.addAttribute("brands", brands);
- 
 
 1129 
		model.addAttribute("selectedbrand", brand);
- 
 
 1130 
 
- 
 
 1131 
		LOGGER.info("warehouseWiseBrandPartnerSales" + warehouseWiseBrandPartnerSales);
- 
 
 1132 
		return "warehousewise_accessoriesbrand_sale";
- 
 
 1133 
	}
- 
 
 1134 
 
1113 
	@RequestMapping(value = "/getWarehouseBrandWiseItemSale", method = RequestMethod.GET)
 1135 
	@RequestMapping(value = "/getWarehouseBrandWiseItemSale", method = RequestMethod.GET)
1114 
	public String getWarehouseBrandWiseItemSale(HttpServletRequest request, Model model,
 1136 
	public String getWarehouseBrandWiseItemSale(HttpServletRequest request, Model model,
1115 
			@RequestParam List<Integer> warehouseId, @RequestParam String brand) throws Exception {
 1137 
			@RequestParam List<Integer> warehouseId, @RequestParam String brand) throws Exception {
1116 
		Map<Integer, String> warehouseMap = ProfitMandiConstants.WAREHOUSE_MAP;
 1138 
		Map<Integer, String> warehouseMap = ProfitMandiConstants.WAREHOUSE_MAP;
1117 
		if (warehouseId.contains(0)) {
 - 
 
1118 
			warehouseId.addAll(warehouseMap.keySet());
 - 
 
1119 
		}
 - 
 
1120 
		List<WarehouseBrandWiseItemSaleModel> branditemSales = fofoStoreRepository
 1139 
		List<WarehouseBrandWiseItemSaleModel> branditemSales = fofoStoreRepository
1121 
				.selectWarehouseBrandItemSale(warehouseId, brand);
 1140 
				.selectWarehouseBrandItemSale(warehouseId, brand);
1122 
		model.addAttribute("branditemSales", branditemSales);
 1141 
		model.addAttribute("branditemSales", branditemSales);
1123 
		model.addAttribute("warehouseMap", warehouseMap);
 1142 
		model.addAttribute("warehouseMap", warehouseMap);
1124 
		return "warehouse_partner_itemwise_sale";
 1143 
		return "warehouse_partner_itemwise_sale";
1125 
	}
 1144 
	}
1126 
 
 1145 
 
- 
 
 1146 
	@RequestMapping(value = "/getWarehouseAccesoriesBrandWiseItemSale", method = RequestMethod.GET)
- 
 
 1147 
	public String getWarehouseAccesoriesBrandWiseItemSale(HttpServletRequest request, Model model,
- 
 
 1148 
			@RequestParam List<Integer> warehouseId, @RequestParam String brand) throws Exception {
- 
 
 1149 
		Map<Integer, String> warehouseMap = ProfitMandiConstants.WAREHOUSE_MAP;
- 
 
 1150 
		List<WarehouseBrandWiseItemSaleModel> branditemSales = fofoStoreRepository
- 
 
 1151 
				.selectWarehouseAccesoriesBrandItemSale(warehouseId, brand);
- 
 
 1152 
		model.addAttribute("branditemSales", branditemSales);
- 
 
 1153 
		model.addAttribute("warehouseMap", warehouseMap);
- 
 
 1154 
		return "warehouse_accessories_itemwsie_sale";
- 
 
 1155 
	}
- 
 
 1156 
 
1127 
	private List<Menu> prepareMenu(List<Menu> menus) {
 1157 
	private List<Menu> prepareMenu(List<Menu> menus) {
1128 
		List<Menu> returnMenu = new ArrayList<>();
 1158 
		List<Menu> returnMenu = new ArrayList<>();
1129 
		Map<Menu, List<Menu>> subMenuMap = new HashMap<Menu, List<Menu>>();
 1159 
		Map<Menu, List<Menu>> subMenuMap = new HashMap<Menu, List<Menu>>();
1130 
		for (Menu menu : menus) {
 1160 
		for (Menu menu : menus) {
1131 
			if (menu.get_parent() == null) {
 1161 
			if (menu.get_parent() == null) {