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

         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, InStockAccessoriesTvQtyFofoIdModel> inStockQtyAccessTv = new HashMap<>();
+        Map<Integer, InStockAccessoriesTvQtyFofoIdModel> pendingIndentQtyAccessTv = new HashMap<>();
+        Map<Integer, InStockAccessoriesTvQtyFofoIdModel> grnPendingQtyAccessTvOrders = new HashMap<>();
         Map<Integer, CustomRetailer> customRetailerMap = retailerService.getAllFofoRetailers();
         Map<Integer, CustomRetailer> customRetailers = new HashMap<>();
         Map<Integer, PartnerType> fofoIdPartnerTypeMap = new HashMap<>();
         if (fofoIds != null && fofoIds.size() > 0) {
             Map<Integer, Map<String, Double>> pendingIndentQty;
             Map<Integer, Map<String, Double>> grnPendingOrders;
             Map<Integer, Map<String, Double>> grnPendingOrdersQty;
             // mobile
-            inStockBrandModel = currentInventorySnapshotRepository.selectSumInStockMobiletabletGroupByBrand(fofoIdList)
+            List<InStockBrandFofoIdModel> inStockBrandFofoIdModels = currentInventorySnapshotRepository.selectSumInStockMobiletabletGroupByBrand(fofoIdList);
+            inStockBrandModel = inStockBrandFofoIdModels
                     .stream()
                     .collect(Collectors.groupingBy(InStockBrandFofoIdModel::getFofoId,
                             Collectors.groupingBy(InStockBrandFofoIdModel::getBrand,
                                     Collectors.summingDouble(InStockBrandFofoIdModel::getAmount))));
-            inStockBrandModelQty = currentInventorySnapshotRepository.selectSumInStockMobiletabletGroupByBrand(fofoIdList)
+            inStockBrandModelQty = inStockBrandFofoIdModels
                     .stream()
                     .collect(Collectors.groupingBy(InStockBrandFofoIdModel::getFofoId,
                             Collectors.groupingBy(InStockBrandFofoIdModel::getBrand,
                                     Collectors.summingDouble(InStockBrandFofoIdModel::getQty))));
-            pendingIndent = transactionService.getInTransitOrders(fofoIdList).stream()
+            List<Order> pendingIndentOrders = transactionService.getInTransitOrders(fofoIdList);
+            pendingIndent = pendingIndentOrders.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()
+            pendingIndentQty = pendingIndentOrders.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()
+            List<Order> grnPendingOrderList = orderRepository.selectPendingGrnOrders(fofoIdList);
+            grnPendingOrders = grnPendingOrderList.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()
+            grnPendingOrdersQty = grnPendingOrderList.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()))));
                     .stream().collect(Collectors.toMap(x -> x.getFofoId(), x -> x));
             grnPendingAccessTvOrders = orderRepository.selectAllGrnPendingAccessoriesTvGroupByFofoId(fofoIdList)
                     .stream().collect(Collectors.toMap(x -> x.getFofoId(), x -> x));
+            inStockQtyAccessTv = currentInventorySnapshotRepository.selectQtySumInStockAccessoriesAndTv(fofoIdList).stream()
+                    .collect(Collectors.toMap(x -> x.getFofoId(), x -> x));
+            pendingIndentQtyAccessTv = orderRepository.selectAllQtyPendingIndentAccessoriesTvGroupByFofoId(fofoIdList)
+                    .stream().collect(Collectors.toMap(x -> x.getFofoId(), x -> x));
+            grnPendingQtyAccessTvOrders = orderRepository.selectAllQtyGrnPendingAccessoriesTvGroupByFofoId(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());
         model.addAttribute("fofoIdBrandQtyMap", fofoIdBrandQtyMap);
         model.addAttribute("inStockAccessTv", inStockAccessTv);
         model.addAttribute("pendingIndentAccessTv", pendingIndentAccessTv);
         model.addAttribute("grnPendingAccessTvOrders", grnPendingAccessTvOrders);
+        model.addAttribute("inStockQtyAccessTv", inStockQtyAccessTv);
+        model.addAttribute("pendingIndentQtyAccessTv", pendingIndentQtyAccessTv);
+        model.addAttribute("grnPendingQtyAccessTvOrders", grnPendingQtyAccessTvOrders);
         model.addAttribute("fofoIdPartnerTypeMap", fofoIdPartnerTypeMap);
         return "partner-brandwise-detail";
+    }

Subversion Repositories SmartDukaan

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