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

 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.net.URISyntaxException;
+import java.time.Duration;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.time.YearMonth;
 import java.time.format.DateTimeFormatter;
+import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Comparator;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.csv.CSVFormat;
 import org.apache.commons.csv.CSVRecord;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.apache.poi.ss.formula.functions.Days360;
 import org.apache.thrift.TException;
 import org.hibernate.type.CurrencyType;
 import org.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import com.spice.profitmandi.dao.entity.transaction.NotifyColorChange;
 import com.spice.profitmandi.dao.entity.transaction.NotifyMessage;
 import com.spice.profitmandi.dao.entity.transaction.NotifyOrder;
 import com.spice.profitmandi.dao.entity.transaction.Order;
 import com.spice.profitmandi.dao.model.BrandItemWiseTertiaryModel;
+import com.spice.profitmandi.dao.model.BrandRegionModel;
 import com.spice.profitmandi.dao.model.BrandWiseTertiaryModel;
 import com.spice.profitmandi.dao.model.ContentPojo;
 import com.spice.profitmandi.dao.model.OpenPoItemModel;
 import com.spice.profitmandi.dao.model.OpenPoModel;
 import com.spice.profitmandi.dao.model.OurPurchaseItemModel;
 import com.spice.profitmandi.dao.model.OurPurchaseModel;
+import com.spice.profitmandi.dao.model.SecondaeryOrderDateRange;
 import com.spice.profitmandi.dao.model.SecondaryOrderBillingModel;
 import com.spice.profitmandi.dao.model.SecondaryOrderItemBillingModel;
+import com.spice.profitmandi.dao.model.SecondaryWarehouseWiseOrderBilllingModel;
 import com.spice.profitmandi.dao.model.Specification;
 import com.spice.profitmandi.dao.model.SpecificationGroup;
 import com.spice.profitmandi.dao.repository.catalog.ItemRepository;
 import com.spice.profitmandi.dao.repository.catalog.TagListingRepository;
 import com.spice.profitmandi.dao.repository.catalog.TagRankingRepository;
 		return "inventory-listing-purchase-item";
+	}
-	@RequestMapping(value = "/getSecondaryBillingItemByBrand", method = RequestMethod.GET)
+	@RequestMapping(value = "/getWarehouseWiseSecondaryBillingByBrand", method = RequestMethod.GET)
-	public String getSecondaryBillingItemByBrand(HttpServletRequest request,
+	public String getWarehouseWiseSecondaryBillingByBrand(HttpServletRequest request,
-			@RequestParam(name = "warehouseIds", required = true, defaultValue = "0") List<Integer> warehouseIds,
-			@RequestParam(name = "brand", required = true, defaultValue = "") List<String> brand, int timeValue,
+			@RequestParam(name = "brand", required = true, defaultValue = "") String brand, int timeValue, Model model)
-			Model model) throws Exception {
+			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")) {
+		Map<Integer, String> warehouseMap = ProfitMandiConstants.WAREHOUSE_MAP;
-			List<String> billingbrands = orderRepository.selectAllBilledOrderGroupByBrand(warehouseIds).stream()
+		SecondaeryOrderDateRange sr = null;
-					.map(x -> x.getBrand()).collect(Collectors.toList());
+		if (brand.equals("Total Values")) {
-			brand.addAll(billingbrands);
+			brand = null;
+		}
-		List<SecondaryOrderItemBillingModel> billedItem = null;
 		if (timeValue != 0) {
 			if (timeValue == 1) {
-				billedItem = orderRepository.selectAllBilledOrderItemByBrand(warehouseIds, brand,
-						curDate.withDayOfMonth(1), curDate.plusDays(1));
+				sr = getSecondaryModel(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),
+				sr = getSecondaryModel(brand, curDate.withDayOfMonth(1).minusMonths(1),
 						startOfMonth.minusMonths(1).plusDays(Math.min(dayOfMonth, lengthOfMonth)));
 			} else if (timeValue == -1) {
-				billedItem = orderRepository.selectAllBilledOrderItemByBrand(warehouseIds, brand,
-						curDate.minusMonths(1).withDayOfMonth(1), startOfMonth);
+				sr = getSecondaryModel(brand, curDate.minusMonths(1).withDayOfMonth(1), startOfMonth);
 			} else {
-				billedItem = orderRepository.selectAllBilledOrderItemByBrand(warehouseIds, brand,
-						curDate.minusDays(timeValue), curDate);
+				sr = getSecondaryModel(brand, curDate.minusDays(timeValue), curDate);
+			}
 		} else {
-			billedItem = orderRepository.selectTodayBilledOrderItemByBrand(warehouseIds, brand, curDate);
+			sr = getSecondaryModel(brand, curDate, curDate.plusDays(1));
+		}
-		LOGGER.info("billedItem" + billedItem);
+		Map<BrandRegionModel, Map<LocalDate, SecondaryWarehouseWiseOrderBilllingModel>> brandWarehouseOrderMap = sr
+				.getSecondaryModel().stream()
+				.collect(Collectors.groupingBy(x -> new BrandRegionModel(x.getWarehouseId(), x.getBrand()),
+						Collectors.collectingAndThen(Collectors.toList(),
+								x -> x.stream().collect(Collectors.toMap(y -> y.getBillingTimestamp(), y -> y)))));
+		brandWarehouseOrderMap.entrySet().stream().forEach(x -> {
+			x.getKey().setTotal(
+					x.getValue().entrySet().stream().collect(Collectors.summingLong(y -> y.getValue().getValue())));
+		});
+		LOGGER.info("brandWarehouseOrderMap" + brandWarehouseOrderMap);
+		model.addAttribute("brandWarehouseOrderMap", brandWarehouseOrderMap);
+		model.addAttribute("dateRange", sr.getDateRange());
-		model.addAttribute("billedItem", billedItem);
+		model.addAttribute("warehouseMap", warehouseMap);
+		return "secondary-warehouse-billing-order";
+	}
+	public SecondaeryOrderDateRange getSecondaryModel(String brand, LocalDateTime startDate, LocalDateTime endDate) {
+		SecondaeryOrderDateRange sr = new SecondaeryOrderDateRange();
+		List<SecondaryWarehouseWiseOrderBilllingModel> secondaryOrderbilling = orderRepository
+				.selectAllBilledOrderGroupByBrandWarehouse(brand, startDate, endDate).stream()
+				.sorted(Comparator.comparing(SecondaryWarehouseWiseOrderBilllingModel::getBillingTimestamp))
+				.collect(Collectors.toList());
+		long noOfDaysBetween = ChronoUnit.DAYS.between(startDate, endDate);
+		List<LocalDate> dateRange = Stream.iterate(startDate.toLocalDate(), date -> date.plusDays(1))
+				.limit(noOfDaysBetween).collect(Collectors.toList());
+		sr.setDateRange(dateRange);
+		sr.setSecondaryModel(secondaryOrderbilling);
+		return sr;
+	}
+	@RequestMapping(value = "/getSecondaryBillingItemByBrand", method = RequestMethod.GET)
+	public String getSecondaryBillingItemByBrand(HttpServletRequest request,
+			@RequestParam(name = "warehouseId", required = true, defaultValue = "0") int warehouseId,
+			@RequestParam(name = "brand", required = true, defaultValue = "") String brand,
+			@RequestParam LocalDate date, Model model) throws Exception {
+		List<SecondaryOrderItemBillingModel> orderItemBilling = orderRepository
+				.selectAllBilledOrderItemByBrand(warehouseId, brand, date);
+		LOGGER.info("orderItemBilling" + orderItemBilling);
+		model.addAttribute("billedItem", orderItemBilling);
+		model.addAttribute("date", date);
+		model.addAttribute("brand", brand);
 		return "inventory-listing-billing-item";
+	}
 	@RequestMapping(value = "/getPartnerTertiaryItemByBrand", method = RequestMethod.GET)
 		model.addAttribute("tertiaryItem", tertiaryItem);
 		return "inventory-item-tertiary-item";
+	}
-}
+}

Subversion Repositories SmartDukaan

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