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

         List<PartnerStockDescriptionModel> pendingIndents = new ArrayList<>();
         Map<Integer, Integer> currentInventorySnapshot = currentInventorySnapshotRepository.selectByFofoId(fofoId)
                 .stream().collect(Collectors.toMap(x -> x.getItemId(), x -> x.getAvailability()));
         if (!currentInventorySnapshot.isEmpty()) {
+           /* as of now its commented showed all brand data
             if (!brand.equals("undefined") && !brand.equals("accessories") && !brand.equals("TV")) {
                 catalogIdAndQtyMap = itemRepository.selectByIds(currentInventorySnapshot.keySet()).stream()
                         .filter(x -> x.getBrand().equals(brand))
                         .collect(Collectors.groupingBy(x -> x.getCatalogItemId(),
                                 Collectors.summingInt(x -> currentInventorySnapshot.get(x.getId()))));
             } else {
                 catalogIdAndQtyMap = itemRepository.selectByIds(currentInventorySnapshot.keySet()).stream()
                         .collect(Collectors.groupingBy(x -> x.getCatalogItemId(),
                                 Collectors.summingInt(x -> currentInventorySnapshot.get(x.getId()))));
-            }
+            }*/
+            catalogIdAndQtyMap = itemRepository.selectByIds(currentInventorySnapshot.keySet()).stream()
+                    .collect(Collectors.groupingBy(x -> x.getCatalogItemId(),
+                            Collectors.summingInt(x -> currentInventorySnapshot.get(x.getId()))));
             inStocks.addAll(getBrandItemwiseDescription(brand, catalogIdAndQtyMap));
+        }
+        Map<String, List<PartnerStockDescriptionModel>> brandInstockListMap = inStocks.stream().collect(Collectors.groupingBy(PartnerStockDescriptionModel::getBrand));
         Map<Integer, Integer> grnPendingOrders = orderRepository.selectPendingGrnOrders(fofoId).stream()
                 .collect(Collectors.groupingBy(x -> x.getLineItem().getItemId(),
                         Collectors.summingInt(x -> x.getLineItem().getQuantity())));
         if (!grnPendingOrders.isEmpty()) {
-            if (!brand.equals("undefined") && !brand.equals("accessories") && !brand.equals("TV")) {
+           /* if (!brand.equals("undefined") && !brand.equals("accessories") && !brand.equals("TV")) {
                 grnPendingOrdersMap = itemRepository.selectByIds(grnPendingOrders.keySet()).stream()
                         .filter(x -> x.getBrand().equals(brand))
                         .collect(Collectors.groupingBy(x -> x.getCatalogItemId(),
                                 Collectors.summingInt(x -> grnPendingOrders.get(x.getId()))));
             } else {
                 grnPendingOrdersMap = itemRepository.selectByIds(grnPendingOrders.keySet()).stream()
                         .collect(Collectors.groupingBy(x -> x.getCatalogItemId(),
                                 Collectors.summingInt(x -> grnPendingOrders.get(x.getId()))));
-            }
+            }*/
+            grnPendingOrdersMap = itemRepository.selectByIds(grnPendingOrders.keySet()).stream()
+                    .collect(Collectors.groupingBy(x -> x.getCatalogItemId(),
+                            Collectors.summingInt(x -> grnPendingOrders.get(x.getId()))));
             grnPendings.addAll(getBrandItemwiseDescription(brand, grnPendingOrdersMap));
+        }
         Map<Integer, Integer> processingOrder = orderRepository.selectOrders(fofoId, orderStatusList).stream()
                 .collect(Collectors.groupingBy(x -> x.getLineItem().getItemId(),
                         Collectors.summingInt(x -> x.getLineItem().getQuantity())));
         if (!processingOrder.isEmpty()) {
-            if (!brand.equals("undefined") && !brand.equals("accessories") && !brand.equals("TV")) {
+           /* if (!brand.equals("undefined") && !brand.equals("accessories") && !brand.equals("TV")) {
                 processingOrderMap = itemRepository.selectByIds(processingOrder.keySet()).stream()
                         .filter(x -> x.getBrand().equals(brand)).collect(Collectors.groupingBy(
                                 x -> x.getCatalogItemId(), Collectors.summingInt(x -> processingOrder.get(x.getId()))));
             } else {
                 processingOrderMap = itemRepository.selectByIds(processingOrder.keySet()).stream()
                         .collect(Collectors.groupingBy(x -> x.getCatalogItemId(),
                                 Collectors.summingInt(x -> processingOrder.get(x.getId()))));
-            }
+            }*/
+            processingOrderMap = itemRepository.selectByIds(processingOrder.keySet()).stream()
+                    .collect(Collectors.groupingBy(x -> x.getCatalogItemId(),
+                            Collectors.summingInt(x -> processingOrder.get(x.getId()))));
             pendingIndents.addAll(getBrandItemwiseDescription(brand, processingOrderMap));
+        }
         List<Integer> regionIds = partnerRegionRepository.selectByfofoId(fofoId).stream().map(x -> x.getRegionId())
         model.addAttribute("focusedModelShortageList", focusedModelShortageList);
         model.addAttribute("inStocks", inStocks);
+        model.addAttribute("brandInstockListMap", brandInstockListMap);
         model.addAttribute("grnPendings", grnPendings);
         model.addAttribute("pendingIndents", pendingIndents);
         model.addAttribute("customRetailer", customRetailer);

Subversion Repositories SmartDukaan

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