Subversion Repositories SmartDukaan

Rev

Rev 34035 | Rev 34098 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 34035 Rev 34087
Line 1913... Line 1913...
1913
        model.addAttribute("response1", mvcResponseSender.createResponseString(true));
1913
        model.addAttribute("response1", mvcResponseSender.createResponseString(true));
1914
 
1914
 
1915
        return "response";
1915
        return "response";
1916
    }
1916
    }
1917
 
1917
 
-
 
1918
 
1918
    @RequestMapping(value = "/getPartnerShortageStock", method = RequestMethod.GET)
1919
    @RequestMapping(value = "/getPartnerShortageStockDetail", method = RequestMethod.GET)
1919
    public String getPartnerShortageStock(HttpServletRequest request,
1920
    public String getPartnerShortageStockDetail(HttpServletRequest request,
1920
                                          @RequestParam(required = false, defaultValue = "") String brand, @RequestParam int fofoId, Model model)
1921
                                          @RequestParam(required = false, defaultValue = "") String brand, @RequestParam int fofoId, Model model)
1921
            throws Exception {
1922
            throws Exception {
1922
 
1923
 
1923
        Map<Integer, Map<Integer, List<SaholicPOItem>>> warehousePoItemAvailabilityMap = saholicInventoryService
1924
        Map<Integer, Map<Integer, List<SaholicPOItem>>> warehousePoItemAvailabilityMap = saholicInventoryService
1924
                .getSaholicPOItems();
1925
                .getSaholicPOItems();
Line 2096... Line 2097...
2096
 
2097
 
2097
            model.addAttribute("pendingIndentBrandMap", pendingIndentBrandMap);
2098
            model.addAttribute("pendingIndentBrandMap", pendingIndentBrandMap);
2098
 
2099
 
2099
        }
2100
        }
2100
 
2101
 
-
 
2102
        return "partner-stock-detail";
-
 
2103
 
-
 
2104
    }
-
 
2105
 
-
 
2106
    @RequestMapping(value = "/getPartnerShortageStock", method = RequestMethod.GET)
2101
        FofoStore fofoStore = fofoStoreRepository.selectByRetailerId(fofoId);
2107
    public String getPartnerShortageStock(HttpServletRequest request,
-
 
2108
                                          @RequestParam(required = false, defaultValue = "") String brand, @RequestParam int fofoId, Model model)
-
 
2109
            throws Exception {
2102
 
2110
 
-
 
2111
        FofoStore fofoStore = fofoStoreRepository.selectByRetailerId(fofoId);
-
 
2112
        CustomRetailer customRetailer = retailerService.getFofoRetailer(fofoId);
2103
 
2113
 
2104
        List<PartnerWarehouseStockSummaryModel> partnerWarehouseStockSummaryModels = saholicInventoryService.getSaholicAndPartnerStock(fofoId, fofoStore.getWarehouseId());
2114
        List<PartnerWarehouseStockSummaryModel> partnerWarehouseStockSummaryModels = saholicInventoryService.getSaholicAndPartnerStock(fofoId, fofoStore.getWarehouseId());
2105
 
2115
 
2106
        Set<Integer> catalogIds = partnerWarehouseStockSummaryModels.stream().map(x -> x.getCatalogId()).collect(Collectors.toSet());
2116
        Set<Integer> catalogIds = partnerWarehouseStockSummaryModels.stream().map(x -> x.getCatalogId()).collect(Collectors.toSet());
2107
 
2117
 
Line 2162... Line 2172...
2162
                        LinkedHashMap::new // Maintain order of brands
2172
                        LinkedHashMap::new // Maintain order of brands
2163
                ));
2173
                ));
2164
 
2174
 
2165
        model.addAttribute("brandStatusWiseStockListMap", sortedBrandStatusWiseStockListMap);
2175
        model.addAttribute("brandStatusWiseStockListMap", sortedBrandStatusWiseStockListMap);
2166
        model.addAttribute("brands", brands);
2176
        model.addAttribute("brands", brands);
2167
 
-
 
-
 
2177
        model.addAttribute("brand", brand);
-
 
2178
        model.addAttribute("fofoId", fofoId);
-
 
2179
        model.addAttribute("customRetailer", customRetailer);
2168
        return "partner-stock";
2180
        return "partner-stock";
2169
 
2181
 
2170
    }
2182
    }
2171
 
2183
 
2172
    private List<PartnerStockDescriptionModel> getBrandItemwiseDescription(String brand,
2184
    private List<PartnerStockDescriptionModel> getBrandItemwiseDescription(String brand,