Subversion Repositories SmartDukaan

Rev

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

Rev 28822 Rev 28989
Line 68... Line 68...
68
			@RequestParam(name = "warehouseName", required = true, defaultValue = "0") String warehouseName,
68
			@RequestParam(name = "warehouseName", required = true, defaultValue = "0") String warehouseName,
69
			@RequestParam(name = "pin", required = true, defaultValue = "0") String pinCode, Model model)
69
			@RequestParam(name = "pin", required = true, defaultValue = "0") String pinCode, Model model)
70
 
70
 
71
			throws Exception {
71
			throws Exception {
72
 
72
 
73
		Seller seller = sellerRepository.sellerSelectById(sellerId);
73
		Seller seller = sellerRepository.selectById(sellerId);
74
		WarehouseAddressMaster wam = wareHouseAddressMasterRepository.selectByAddressId(address);
74
		WarehouseAddressMaster wam = wareHouseAddressMasterRepository.selectByAddressId(address);
75
 
75
 
76
		Warehouse warehouse = new Warehouse();
76
		Warehouse warehouse = new Warehouse();
77
		warehouse.setDisplayName(warehouseName);
77
		warehouse.setDisplayName(warehouseName);
78
		warehouse.setLocation(wam.getAddress());
78
		warehouse.setLocation(wam.getAddress());
Line 187... Line 187...
187
 
187
 
188
		List<SellerWarehouse> sellerWarehouse = sellerWarehouseRepository.selectBySellerId(sellerId);
188
		List<SellerWarehouse> sellerWarehouse = sellerWarehouseRepository.selectBySellerId(sellerId);
189
 
189
 
190
		List<WarehouseAddressMaster> allWarehouseAddressMaster = sellerRepository.selectAllWarehouseAddressMaster();
190
		List<WarehouseAddressMaster> allWarehouseAddressMaster = sellerRepository.selectAllWarehouseAddressMaster();
191
 
191
 
192
		Map<Integer, Seller> sellersMap = sellerRepository.selectById(sellerId).stream()
192
		Seller seller = sellerRepository.selectById(sellerId);
193
				.collect(Collectors.toMap(x -> x.getId(), x -> x));
-
 
194
 
193
 
195
 
194
 
196
		List<Integer> sellerwarehouseIds = sellerWarehouse.stream().map(x -> x.getWarehouseId())
195
		List<Integer> sellerwarehouseIds = sellerWarehouse.stream().map(x -> x.getWarehouseId())
197
				.collect(Collectors.toList());
196
				.collect(Collectors.toList());
198
 
197
 
Line 206... Line 205...
206
		}
205
		}
207
 
206
 
208
		model.addAttribute("allWhm", allWarehouseAddressMaster);
207
		model.addAttribute("allWhm", allWarehouseAddressMaster);
209
 
208
 
210
		model.addAttribute("wam", wam);
209
		model.addAttribute("wam", wam);
211
		model.addAttribute("seller", sellersMap);
210
		model.addAttribute("seller", seller);
212
		model.addAttribute("sellerId", sellerId);
211
		model.addAttribute("sellerId", sellerId);
213
		model.addAttribute("sellerWarehouse", sellerWarehouse);
212
		model.addAttribute("sellerWarehouse", sellerWarehouse);
214
		return "seller-warehouse-container";
213
		return "seller-warehouse-container";
215
	}
214
	}
216
 
215