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

         Set<Integer> fofoIds = csService1.getAuthFofoIds(email, true);
         Map<Integer, PartnerDailyInvestment> partnerDailyInvestmentMap = new HashMap<>();
         Map<Integer, Map<String, Double>> fofoIdBrandAmountMap = new HashMap<>();
+        Map<Integer, Map<String, Double>> fofoIdBrandQtyMap = new HashMap<>();
         Map<Integer, InStockAccessoriesTvFofoIdModel> inStockAccessTv = new HashMap<>();
         Map<Integer, InStockAccessoriesTvFofoIdModel> pendingIndentAccessTv = new HashMap<>();
         Map<Integer, InStockAccessoriesTvFofoIdModel> grnPendingAccessTvOrders = new HashMap<>();
         Map<Integer, CustomRetailer> customRetailerMap = retailerService.getAllFofoRetailers();
             model.addAttribute("partnerBrandLimitMap", partnerBrandLimitMap);
             customRetailers = fofoIds.stream().map(x -> customRetailerMap.get(x)).filter(x -> x != null)
                     .collect(Collectors.toList()).stream().collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
             Map<Integer, Map<String, Double>> inStockBrandModel;
+            Map<Integer, Map<String, Double>> inStockBrandModelQty;
             Map<Integer, Map<String, Double>> pendingIndent;
+            Map<Integer, Map<String, Double>> pendingIndentQty;
             Map<Integer, Map<String, Double>> grnPendingOrders;
+            Map<Integer, Map<String, Double>> grnPendingOrdersQty;
             // mobile
             inStockBrandModel = currentInventorySnapshotRepository.selectSumInStockMobiletabletGroupByBrand(fofoIdList)
                     .stream()
                     .collect(Collectors.groupingBy(InStockBrandFofoIdModel::getFofoId,
                             Collectors.groupingBy(InStockBrandFofoIdModel::getBrand,
                                     Collectors.summingDouble(InStockBrandFofoIdModel::getAmount))));
+            inStockBrandModelQty = currentInventorySnapshotRepository.selectSumInStockMobiletabletGroupByBrand(fofoIdList)
+                    .stream()
+                    .collect(Collectors.groupingBy(InStockBrandFofoIdModel::getFofoId,
+                            Collectors.groupingBy(InStockBrandFofoIdModel::getBrand,
+                                    Collectors.summingDouble(InStockBrandFofoIdModel::getQty))));
             pendingIndent = transactionService.getInTransitOrders(fofoIdList).stream()
                     .filter(x -> x.getLineItem().getItem().getCategoryId() == ProfitMandiConstants.MOBILE_CATEGORY_ID)
                     .collect(Collectors.groupingBy(x -> x.getRetailerId(),
                             Collectors.groupingBy(y -> y.getLineItem().getBrand(),
                                     Collectors.summingDouble(y -> (double) y.getTotalAmount()))));
+            pendingIndentQty = transactionService.getInTransitOrders(fofoIdList).stream()
+                    .filter(x -> x.getLineItem().getItem().getCategoryId() == ProfitMandiConstants.MOBILE_CATEGORY_ID)
+                    .collect(Collectors.groupingBy(x -> x.getRetailerId(),
+                            Collectors.groupingBy(y -> y.getLineItem().getBrand(),
+                                    Collectors.summingDouble(y -> (double) y.getLineItem().getQuantity()))));
             grnPendingOrders = orderRepository.selectPendingGrnOrders(fofoIdList).stream()
                     .filter(x -> x.getLineItem().getItem().getCategoryId() == ProfitMandiConstants.MOBILE_CATEGORY_ID)
                     .collect(Collectors.groupingBy(x -> x.getRetailerId(),
                             Collectors.groupingBy(y -> y.getLineItem().getBrand(),
                                     Collectors.summingDouble(y -> (double) y.getTotalAmount()))));
+            grnPendingOrdersQty = orderRepository.selectPendingGrnOrders(fofoIdList).stream()
+                    .filter(x -> x.getLineItem().getItem().getCategoryId() == ProfitMandiConstants.MOBILE_CATEGORY_ID)
+                    .collect(Collectors.groupingBy(x -> x.getRetailerId(),
+                            Collectors.groupingBy(y -> y.getLineItem().getBrand(),
+                                    Collectors.summingDouble(y -> (double) y.getLineItem().getQuantity()))));
             // accessories
             inStockAccessTv = currentInventorySnapshotRepository.selectSumInStockAccessoriesAndTv(fofoIdList).stream()
                     .collect(Collectors.toMap(x -> x.getFofoId(), x -> x));
             // Bulk fetch partner types to avoid N+1 queries
             fofoIdPartnerTypeMap = partnerTypeChangeService.getTypesForFofoIds(new ArrayList<>(customRetailers.keySet()), LocalDate.now());
             for (Entry<Integer, CustomRetailer> customRetailer : customRetailers.entrySet()) {
                 Map<String, Double> stockBrand = inStockBrandModel.get(customRetailer.getKey());
+                Map<String, Double> stockBrandQty = inStockBrandModelQty.get(customRetailer.getKey());
                 Map<String, Double> pendingIndentBrand = pendingIndent.get(customRetailer.getKey());
+                Map<String, Double> pendingIndentBrandQty = pendingIndentQty.get(customRetailer.getKey());
                 Map<String, Double> grnBrand = grnPendingOrders.get(customRetailer.getKey());
+                Map<String, Double> grnBrandQty = grnPendingOrdersQty.get(customRetailer.getKey());
                 double totalAmount = 0;
+                double totalQty = 0;
                 Map<String, Double> brandAmountMap = new HashMap<>();
+                Map<String, Double> brandQtyMap = new HashMap<>();
                 for (String brand : brands) {
                     double stockValue = 0;
+                    double stockQty = 0;
                     double pendingValue = 0;
+                    double pendingQty = 0;
                     double grnValue = 0;
+                    double grnQty = 0;
                     if (stockBrand != null) {
                         if (stockBrand.get(brand) != null) {
                             stockValue = stockBrand.get(brand);
+                        }
+                    }
+                    if (stockBrandQty != null) {
+                        if (stockBrandQty.get(brand) != null) {
+                            stockQty = stockBrandQty.get(brand);
+                        }
+                    }
                     if (pendingIndentBrand != null) {
                         if (pendingIndentBrand.get(brand) != null) {
                             pendingValue = pendingIndentBrand.get(brand);
+                        }
+                    }
+                    if (pendingIndentBrandQty != null) {
+                        if (pendingIndentBrandQty.get(brand) != null) {
+                            pendingQty = pendingIndentBrandQty.get(brand);
+                        }
+                    }
                     if (grnBrand != null) {
                         if (grnBrand.get(brand) != null) {
                             grnValue = grnBrand.get(brand);
+                        }
+                    }
+                    if (grnBrandQty != null) {
+                        if (grnBrandQty.get(brand) != null) {
+                            grnQty = grnBrandQty.get(brand);
+                        }
+                    }
                     totalAmount = stockValue + pendingValue + grnValue;
+                    totalQty = stockQty + pendingQty + grnQty;
                     brandAmountMap.put(brand, totalAmount);
+                    brandQtyMap.put(brand, totalQty);
+                }
                 fofoIdBrandAmountMap.put(customRetailer.getKey(), brandAmountMap);
+                fofoIdBrandQtyMap.put(customRetailer.getKey(), brandQtyMap);
+            }
             List<PartnerDailyInvestment> partnerDailyInvestments = partnerDailyInvestmentRepository
                     .selectAll(new ArrayList<>(fofoIdList), LocalDate.now().minusDays(1));
         model.addAttribute("brands", brands);
         model.addAttribute("brandAmountLimit", Brand_Amount_Limit);
         model.addAttribute("fofoIdBrandAmountMap", fofoIdBrandAmountMap);
+        model.addAttribute("fofoIdBrandQtyMap", fofoIdBrandQtyMap);
         model.addAttribute("inStockAccessTv", inStockAccessTv);
         model.addAttribute("pendingIndentAccessTv", pendingIndentAccessTv);
         model.addAttribute("grnPendingAccessTvOrders", grnPendingAccessTvOrders);
         model.addAttribute("fofoIdPartnerTypeMap", fofoIdPartnerTypeMap);

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/IndentController.java – Rev 35462 → 35484