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

         mp.setAuthId(loginDetails.getEmailId());
         suggestedPoRepository.persist(mp);
         for (SuggestedPoCatalogModel catalogModel : poCatalogModel) {
             SuggestedPoDetail mpd = new SuggestedPoDetail();
-            int anyItemId = itemRepository.selectAllByCatalogItemId(catalogModel.getCatalogId()).get(0).getId();
-            mpd.setItemId(anyItemId);
+            mpd.setItemId(catalogModel.getItemId());
             mpd.setQuantity(catalogModel.getQty());
             mpd.setUpdatedTimestamp(LocalDateTime.now());
             mpd.setPoId(mp.getId());
             suggestedPoDetailRepository.persist(mpd);
+        }
         CustomRetailer customRetailer = retailerService.getFofoRetailer(fofoId);
         Map<Integer, Integer> processingOrderMap = null;
         Map<Integer, Integer> catalogIdAndQtyMap = null;
         Map<Integer, Integer> grnPendingOrdersMap = null;
+        Map<String, Set<PartnerStockDescriptionModel>> brandToUniqueItemsMap = new HashMap<>();
         List<PartnerStockDescriptionModel> inStocks = new ArrayList<>();
+        Map<String, PartnerStockDescriptionModel> inStocksDescriptionModelMap = new HashMap<>();
         List<PartnerStockDescriptionModel> grnPendings = new ArrayList<>();
+        Map<String, PartnerStockDescriptionModel> grnPendingsDescriptionModelMap = new HashMap<>();
         List<PartnerStockDescriptionModel> pendingIndents = new ArrayList<>();
+        Map<String, PartnerStockDescriptionModel> pendingIndentsDescriptionModelMap = new HashMap<>();
         Map<Integer, Integer> currentInventorySnapshot = currentInventorySnapshotRepository.selectByFofoId(fofoId)
                 .stream().collect(Collectors.toMap(x -> x.getItemId(), x -> x.getAvailability()));
             }*/
             catalogIdAndQtyMap = itemRepository.selectByIds(currentInventorySnapshot.keySet()).stream()
                     .collect(Collectors.groupingBy(x -> x.getCatalogItemId(),
                             Collectors.summingInt(x -> currentInventorySnapshot.get(x.getId()))));
             inStocks.addAll(getBrandItemwiseDescription(brand, catalogIdAndQtyMap));
+            inStocksDescriptionModelMap = inStocks.stream().collect(Collectors.toMap(x -> x.getItemDescription(), x -> x));
+        }
-        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()) {
             }*/
             grnPendingOrdersMap = itemRepository.selectByIds(grnPendingOrders.keySet()).stream()
                     .collect(Collectors.groupingBy(x -> x.getCatalogItemId(),
                             Collectors.summingInt(x -> grnPendingOrders.get(x.getId()))));
             grnPendings.addAll(getBrandItemwiseDescription(brand, grnPendingOrdersMap));
+            grnPendingsDescriptionModelMap = grnPendings.stream().collect(Collectors.toMap(x -> x.getItemDescription(), x -> x));
+        }
         Map<Integer, Integer> processingOrder = orderRepository.selectOrders(fofoId, orderStatusList).stream()
                 .collect(Collectors.groupingBy(x -> x.getLineItem().getItemId(),
             }*/
             processingOrderMap = itemRepository.selectByIds(processingOrder.keySet()).stream()
                     .collect(Collectors.groupingBy(x -> x.getCatalogItemId(),
                             Collectors.summingInt(x -> processingOrder.get(x.getId()))));
             pendingIndents.addAll(getBrandItemwiseDescription(brand, processingOrderMap));
+            pendingIndentsDescriptionModelMap = pendingIndents.stream().collect(Collectors.toMap(x -> x.getItemDescription(), x -> x));
+        }
         List<Integer> regionIds = partnerRegionRepository.selectByfofoId(fofoId).stream().map(x -> x.getRegionId())
                 .collect(Collectors.toList());
+            }
+        }
+        List<PartnerStockDescriptionModel> allStockItems = new ArrayList<>();
+        allStockItems.addAll(inStocks);
+        allStockItems.addAll(grnPendings);
+        allStockItems.addAll(pendingIndents);
-        LOGGER.info("focusedModelShortageList" + focusedModelShortageList);
+        LOGGER.info("allStockItems {}", allStockItems);
+        brandToUniqueItemsMap =
+                allStockItems.stream().collect(
+                        Collectors.groupingBy(
+                                PartnerStockDescriptionModel::getBrand,
+                                Collectors.toSet()
+                        )
+                );
         model.addAttribute("focusedModelShortageList", focusedModelShortageList);
         model.addAttribute("inStocks", inStocks);
+        model.addAttribute("inStocksDescriptionModelMap", inStocksDescriptionModelMap);
-        model.addAttribute("brandInstockListMap", brandInstockListMap);
+        model.addAttribute("brandToUniqueItemsMap", brandToUniqueItemsMap);
         model.addAttribute("grnPendings", grnPendings);
+        model.addAttribute("grnPendingsDescriptionModelMap", grnPendingsDescriptionModelMap);
         model.addAttribute("pendingIndents", pendingIndents);
+        model.addAttribute("pendingIndentsDescriptionModelMap", pendingIndentsDescriptionModelMap);
         model.addAttribute("customRetailer", customRetailer);
         model.addAttribute("brand", brand);
         return "partner-stock-detail";
+    }
+    @RequestMapping(value = "/getPoCatalogsItems", method = RequestMethod.GET)
+    public String getPoCatalogsItems(HttpServletRequest request, @RequestParam int catalogId, @RequestParam float price, Model model)
+            throws Exception {
+        List<Item> poItems = itemRepository.selectAllByCatalogItemId(catalogId);
+        model.addAttribute("poItems", poItems);
+        model.addAttribute("price", price);
+        return "po-catalog-items";
+    }
     @RequestMapping(value = "/getPartnerShortageStock", method = RequestMethod.GET)
     public String getPartnerShortageStock(HttpServletRequest request,
                                           @RequestParam(required = false, defaultValue = "") String brand, @RequestParam(required = false, defaultValue = "0") long shortInvest, @RequestParam int fofoId, Model model)
             throws Exception {

Subversion Repositories SmartDukaan

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