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

 import com.spice.profitmandi.common.exception.ProfitMandiBusinessException;
 import com.spice.profitmandi.common.model.ItemDescriptionModel;
 import com.spice.profitmandi.common.util.FileUtil;
 import com.spice.profitmandi.common.util.FormattingUtils;
 import com.spice.profitmandi.dao.entity.auth.AuthUser;
+import com.spice.profitmandi.dao.entity.catalog.CategorisedCatalog;
 import com.spice.profitmandi.dao.entity.catalog.Item;
 import com.spice.profitmandi.dao.entity.inventory.Vendor;
 import com.spice.profitmandi.dao.entity.inventory.VendorCatalogPricing;
 import com.spice.profitmandi.dao.entity.inventory.VendorCatalogPricingLog;
 import com.spice.profitmandi.dao.entity.warehouse.Supplier;
 import com.spice.profitmandi.dao.enumuration.inventory.VendorCatalogPricingStatus;
 import com.spice.profitmandi.dao.model.VendorCatalogPricingModel;
 import com.spice.profitmandi.dao.model.VendorPriceCircularModel;
 import com.spice.profitmandi.dao.repository.auth.AuthRepository;
+import com.spice.profitmandi.dao.repository.catalog.CategorisedCatalogRepository;
 import com.spice.profitmandi.dao.repository.catalog.ItemRepository;
 import com.spice.profitmandi.dao.repository.inventory.VendorCatalogPricingLogRepository;
 import com.spice.profitmandi.dao.repository.inventory.VendorCatalogPricingRepository;
 import com.spice.profitmandi.dao.repository.inventory.VendorRepository;
 import com.spice.profitmandi.dao.repository.transaction.OrderRepository;
     private SupplierRepository supplierRepository;
     @Autowired
     private WarehouseService warehouseService;
+    @Autowired
+    CategorisedCatalogRepository categorisedCatalogRepository;
     private static final Logger LOGGER = LogManager.getLogger(VendorController.class);
     @RequestMapping(value = "/vendorCatalogPricing", method = RequestMethod.GET)
-    public String vendorCatalogPricing(HttpServletRequest request, Model model) throws Exception {
+    public String vendorCatalogPricing() throws Exception {
         return "vendor-catalog-pricing";
+    }
     @RequestMapping(value = "/getVendorCatalogPricingByModel", method = RequestMethod.GET)
-    public String getVendorCatalogPricingByModel(HttpServletRequest request, @RequestParam int catalogId, Model model) throws Exception {
+    public String getVendorCatalogPricingByModel(@RequestParam int catalogId, Model model) throws Exception {
         List<Integer> vendorIds = new ArrayList<>();
         Map<Integer, VendorCatalogPricing> vendorCatalogPricingMap = new HashMap<>();
         Map<Integer, VendorCatalogPricingLog> vendorCatalogPricingLogMap = new HashMap<>();
         List<VendorCatalogPricing> vendorCatalogPricing = vendorCatalogPricingRepository.selectByCatalogId(catalogId);
         return "vendor-catalog-pricing-view";
+    }
     @RequestMapping(value = "/vendors", method = RequestMethod.GET)
-    public String getVendor(HttpServletRequest request, Model model, @RequestParam String query) throws Throwable {
+    public String getVendor(Model model, @RequestParam String query) throws Throwable {
         List<Supplier> vendors = supplierRepository.selectAll().stream().filter(x -> x.getName().toLowerCase().matches(".*?" + query.toLowerCase() + ".*?"))
                 .filter(x -> x.isStatus()).collect(Collectors.toList());
         model.addAttribute("response1", mvcResponseSender.createResponseString(vendors));
         return "response";
+    }
         return "response";
+    }
     @RequestMapping(value = "/createBulkPricing")
-    public String createBulkPricing(HttpServletRequest request, Model model) throws ProfitMandiBusinessException, MessagingException, IOException {
+    public String createBulkPricing() throws ProfitMandiBusinessException, MessagingException, IOException {
         return "bulk-vendor-pricing";
+    }
     @PostMapping(value = "/bulkVendorCatalogPricing/upload")
     public String uploadCatalog(HttpServletRequest request, @RequestPart("file") MultipartFile file, Model model)
                 .body(new InputStreamResource(dummyFile.getInputStream()));
+    }
     @RequestMapping(value = "/vendorCatalogPricingRequests", method = RequestMethod.GET)
-    public String vendorCatalogPricingRequests(HttpServletRequest request, Model model) throws Exception {
+    public String vendorCatalogPricingRequests(Model model) throws Exception {
         List<VendorCatalogPricingLog> vendorCatalogPricingRequests = vendorCatalogPricingLogRepository.selectByStatus(VendorCatalogPricingStatus.PENDING);
         Map<Integer, AuthUser> authUserMap = authRepository.selectAllActiveUser().stream().collect(Collectors.toMap(x -> x.getId(), x -> x));
         model.addAttribute("vendorCatalogPricingRequests", vendorCatalogPricingRequests);
         if (!vendorCatalogPricingRequests.isEmpty()) {
             Set<Integer> catalogIds = vendorCatalogPricingRequests.stream().map(x -> x.getCatalogId()).collect(Collectors.toSet());
         return "vendor-catalog-pricing-request";
+    }
     @RequestMapping(value = "/vendorCatalogPricingPendingRequests", method = RequestMethod.GET)
-    public String vendorCatalogPricingPendingRequests(HttpServletRequest request, Model model) throws Exception {
+    public String vendorCatalogPricingPendingRequests() throws Exception {
         return "vendor-catalog-pricing-pending-request";
+    }
     @RequestMapping(value = "/datewiseVendorCatalogPricingPendingRequests", method = RequestMethod.GET)
-    public String datewiseVendorCatalogPricingPendingRequests(HttpServletRequest request, @RequestParam LocalDateTime startDate, @RequestParam LocalDateTime endDate, Model model) throws Exception {
+    public String datewiseVendorCatalogPricingPendingRequests(@RequestParam LocalDateTime startDate, @RequestParam LocalDateTime endDate, Model model) throws Exception {
         List<VendorCatalogPricingLog> vendorCatalogPricingRequests = vendorCatalogPricingLogRepository.selectByDate(startDate, endDate);
         Map<Integer, AuthUser> authUserMap = authRepository.selectAllActiveUser().stream().collect(Collectors.toMap(x -> x.getId(), x -> x));
         LOGGER.info("vendorCatalogPricingRequests {}", vendorCatalogPricingRequests);
         model.addAttribute("vendorCatalogPricingRequests", vendorCatalogPricingRequests);
         if (!vendorCatalogPricingRequests.isEmpty()) {
         return "response";
+    }
     @RequestMapping(value = "/vendorPriceCircular", method = RequestMethod.GET)
-    public String vendorPriceCircular(HttpServletRequest request, Model model) throws Exception {
+    public String vendorPriceCircular() throws Exception {
         return "vendor-price-circular";
+    }
     @RequestMapping(value = "/getVendorPriceCircular", method = RequestMethod.GET)
-    public String getVendorPriceCircular(HttpServletRequest request, @RequestParam(defaultValue = "0") int vendorId, @RequestParam LocalDate effectedDate, Model model) throws Exception {
+    public String getVendorPriceCircular(@RequestParam(defaultValue = "0") int vendorId, @RequestParam LocalDate effectedDate, Model model) throws Exception {
         List<VendorPriceCircularModel> vendorCatalogPricings = vendorCatalogPricingLogRepository.getVendorPricesOnDate(vendorId, effectedDate);
         Map<Integer, Supplier> supplierMap = supplierRepository.selectAll().stream().collect(Collectors.toMap(x -> x.getId(), x -> x));
         if (!vendorCatalogPricings.isEmpty()) {
             Set<Integer> catalogIds = vendorCatalogPricings.stream().map(x -> x.getCatalogId()).collect(Collectors.toSet());
         model.addAttribute("vendorCatalogPricings", vendorCatalogPricings);
         model.addAttribute("suppliers", supplierMap);
         return "vendor-price-circular-view";
+    }
     @RequestMapping(value = "/downloadPriceCircularReport", method = RequestMethod.GET)
-    public ResponseEntity<?> getSelectDownloadPriceCircularReport(HttpServletRequest request,
-                                                              @RequestParam(defaultValue = "0") int fofoId,
-                                                              @RequestParam(name = "startDate") LocalDate startDate) throws Exception {
+    public ResponseEntity<?> getSelectDownloadPriceCircularReport(@RequestParam(name = "startDate") LocalDate startDate) throws Exception {
         List<VendorPriceCircularModel> vendorCatalogPricings = vendorCatalogPricingLogRepository.getVendorPricesOnDate(0, startDate);
         Map<Integer, Supplier> supplierMap = supplierRepository.selectAll().stream().collect(Collectors.toMap(x -> x.getId(), x -> x));
         Map<Integer, List<Item>> itemMap = new HashMap<>();
         List<List<?>> rows = new ArrayList<>();
         if (!vendorCatalogPricings.isEmpty()) {
             Set<Integer> catalogIds = vendorCatalogPricings.stream().map(x -> x.getCatalogId()).collect(Collectors.toSet());
             itemMap = itemRepository.selectAllByCatalogIds(catalogIds).stream().collect(Collectors.groupingBy(x -> x.getCatalogItemId()));
+        }
+        for (VendorPriceCircularModel vcp : vendorCatalogPricings) {
-        for(VendorPriceCircularModel vcp: vendorCatalogPricings) {
-            rows.add(Arrays.asList(vcp.getCatalogId(),supplierMap.get(vcp.getVendorId()).getName(),itemMap.get(vcp.getCatalogId()).get(0).getItemDescriptionNoColor(),vcp.getTransferPrice(),vcp.getDealerPrice(),vcp.getMop(),
+            rows.add(Arrays.asList(vcp.getCatalogId(), supplierMap.get(vcp.getVendorId()).getName(), itemMap.get(vcp.getCatalogId()).get(0).getItemDescriptionNoColor(), vcp.getTransferPrice(), vcp.getDealerPrice(), vcp.getMop(),
                     FormattingUtils.formatDate(vcp.getEffectedOn())));
+        }
         org.apache.commons.io.output.ByteArrayOutputStream baos = FileUtil
-                .getCSVByteStream(Arrays.asList("Catalog Id","Vendor Name", "Model name", "TP", "DP", "MOP",
+                .getCSVByteStream(Arrays.asList("Catalog Id", "Vendor Name", "Model name", "TP", "DP", "MOP",
                         "Effected On"), rows);
         ResponseEntity<?> responseEntity = orderService.downloadReportInCsv(baos, rows, "price circular report");
         return responseEntity;
+    }
     @RequestMapping(value = "/getPricing", method = RequestMethod.GET)
     public String getPricing(HttpServletRequest request, @RequestParam int vendorId, @RequestParam int itemId, @RequestParam LocalDate onDate, Model model) throws Exception {
+        List<Integer> checkRequiredCategoryId = Arrays.asList(10006, 10010);
+        List<String> checkRequiredCategoryGroup = Arrays.asList("Handset", "Tablets");
         Item item = itemRepository.selectById(itemId);
+        if (checkRequiredCategoryId.contains(item.getCategoryId()) || checkRequiredCategoryGroup.contains(item.getProductGroup())) {
+            CategorisedCatalog categorisedCatalog = categorisedCatalogRepository.selectByCatalogId(item.getCatalogItemId());
+            if (categorisedCatalog == null || categorisedCatalog.getStatus().getValue().isEmpty()) {
+                model.addAttribute("response1", mvcResponseSender.createResponseString(false));
+                return "response";
+            }
+        }
         VendorPriceCircularModel vendorPriceCircularModel = vendorCatalogPricingLogRepository.getVendorPriceOnDate(vendorId, item.getCatalogItemId(), onDate);
         LOGGER.info("vendorCatalogPricing {}", vendorPriceCircularModel);
         model.addAttribute("response1", mvcResponseSender.createResponseString(vendorPriceCircularModel));
         return "response";
+    }
     private void addVendorPricingIfMissing(int itemId, int vendorId) throws ProfitMandiBusinessException {
         Supplier supplier = supplierRepository.selectById(vendorId);
         Item item = itemRepository.selectById(itemId);
+            }
+        }
+    }
     @RequestMapping(value = "/vendorItem", method = RequestMethod.GET)
-    public String getItemPricing(HttpServletRequest request, Model model, @RequestParam int vendorId,
+    public String getItemPricing(Model model, @RequestParam int vendorId, @RequestParam String query) throws Exception {
-                                 @RequestParam String query) throws Exception {
         String query1 = query.toLowerCase();
         int itemId = 0;
         try {
             itemId = Integer.parseInt(query1);
             addVendorPricingIfMissing(itemId, vendorId);

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/VendorController.java – Rev 33750 → 34047