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

 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.InternalMovementAllocationModel;
 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.transaction.OrderRepository;
 import com.spice.profitmandi.dao.repository.warehouse.SupplierRepository;
 import com.spice.profitmandi.service.authentication.RoleManager;
 import com.spice.profitmandi.service.inventory.VendorCatalogPricingService;
 import com.spice.profitmandi.service.order.OrderService;
+import com.spice.profitmandi.service.warehouse.InternalMovementPricingService;
 import com.spice.profitmandi.service.warehouse.WarehouseService;
 import com.spice.profitmandi.web.model.LoginDetails;
 import com.spice.profitmandi.web.util.CookiesProcessor;
 import com.spice.profitmandi.web.util.MVCResponseSender;
 import org.apache.logging.log4j.LogManager;
     @Autowired
     private WarehouseService warehouseService;
     @Autowired
+    private InternalMovementPricingService internalMovementPricingService;
+    @Autowired
     CategorisedCatalogRepository categorisedCatalogRepository;
     private static final Logger LOGGER = LogManager.getLogger(VendorController.class);
                     model.addAttribute("response1", mvcResponseSender.createResponseString(false));
                     return "response";
+                }
+            }
+        }
+        Supplier vendor = supplierRepository.selectById(vendorId);
+        VendorPriceCircularModel vendorPriceCircularModel = vendor != null && vendor.isInternal()
+                ? this.internalMovementPrice(vendor, item)
-        VendorPriceCircularModel vendorPriceCircularModel = vendorCatalogPricingLogRepository.getVendorPriceOnDate(vendorId, item.getCatalogItemId(), onDate);
+                : 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);
-        int vendorWithPricing = 0;
-        if (supplier.isInternal() && (item.getBrand().equals("Samsung") || item.getCategoryId() != 10006)) {
-            VendorPriceCircularModel vendorPriceCircularModel = vendorCatalogPricingLogRepository.getVendorPriceOnDate(vendorId, item.getCatalogItemId(), LocalDate.now());
-            LOGGER.info("VendorPriceCircularModel - {}", vendorPriceCircularModel);
-            if (vendorPriceCircularModel == null) {
-                if (item.getBrand().equals("Samsung")) {
-                    //BSB
+    /**
-                    vendorWithPricing = 334;
-                } else if (item.getCategoryId() != 10006) {
+     * Price an item moving out of one of our own warehouses: it keeps the price of the vendor it was
-                    vendorWithPricing = vendorCatalogPricingLogRepository.selectByCatalogId(item.getCatalogItemId(), VendorCatalogPricingStatus.APPROVED).stream().map(x -> x.getVendorId())
-                            .findFirst().orElse(null);
+     * originally bought from, so the sending warehouse's own circular is not consulted.
-                }
+     *
-                VendorPriceCircularModel existingPriceCircular = vendorCatalogPricingLogRepository.getVendorPriceOnDate(vendorWithPricing, item.getCatalogItemId(), LocalDate.now());
+     * <p>Answers for a single unit, which is the price the oldest stock moves at. If a larger quantity is
-                LOGGER.info("Existing price circular - {}", existingPriceCircular);
+     * then entered and it would run past that vendor's stock into another's, creating the order says so and
-                if (existingPriceCircular == null) {
+     * names how many can move at this price - the quantity is not known yet at this point.
-                    throw new ProfitMandiBusinessException("Pricing missing for vendor - " + vendorId, "Pricing missing for vendor - " + vendorId, "Pricing missing for vendor - " + vendorId);
-                }
+     */
-                VendorCatalogPricingModel vendorCatalogPricingModel = new VendorCatalogPricingModel();
+    private VendorPriceCircularModel internalMovementPrice(Supplier vendor, Item item)
-                vendorCatalogPricingModel.setAuthId(52);
+            throws ProfitMandiBusinessException {
-                vendorCatalogPricingModel.setVendorId(vendorId);
-                vendorCatalogPricingModel.setCatalogId(existingPriceCircular.getCatalogId());
+        InternalMovementAllocationModel price = internalMovementPricingService.resolvePrice(vendor, item.getId(), 1);
-                vendorCatalogPricingModel.setDp(existingPriceCircular.getDealerPrice());
-                vendorCatalogPricingModel.setEffectedOn(existingPriceCircular.getEffectedOn());
-                vendorCatalogPricingModel.setMop(existingPriceCircular.getMop());
-                vendorCatalogPricingModel.setTp(existingPriceCircular.getTransferPrice());
+        return new VendorPriceCircularModel(0, vendor.getId(), item.getCatalogItemId(), price.getTransferPrice(),
-                vendorCatalogPricingModel.setCatalogId(item.getCatalogItemId());
-                VendorCatalogPricingLog vendorCatalogPricingLog = vendorCatalogPricingService.createVendorCatalogPricingLog(vendorCatalogPricingModel);
-                vendorCatalogPricingLog.setStatus(VendorCatalogPricingStatus.APPROVED);
-                vendorCatalogPricingLog.setUpdatedTimestamp(LocalDateTime.now());
+                price.getDealerPrice(), price.getMop(), LocalDate.now(),
-                //Deenanath Auth Id
-                vendorCatalogPricingLog.setApprovedBy(138);
+                VendorCatalogPricingStatus.APPROVED.name());
-                vendorCatalogPricingLog.setApprovedTimestamp(LocalDateTime.now());
-                vendorCatalogPricingService.createVendorCatalogPricing(vendorCatalogPricingLog);
-            }
-        }
+    }
     @RequestMapping(value = "/vendorItem", method = RequestMethod.GET)
     public String getItemPricing(Model model, @RequestParam int vendorId, @RequestParam String query) throws Exception {
         String query1 = query.toLowerCase();
-        int itemId = 0;
-        try {
-            itemId = Integer.parseInt(query1);
-            addVendorPricingIfMissing(itemId, vendorId);
-        } catch (NumberFormatException e) {
-            LOGGER.info("Ignore number format exception");
-            // e.printStackTrace();
-        }
         LOGGER.info("Vendor Id - {}", vendorId);
         List<ItemDescriptionModel> partnersItemDescription = warehouseService.getAllPartnerItemStringDescription(vendorId).stream().filter(x -> x.getItemDescription().toLowerCase().contains(query1)).collect(Collectors.toList());
         LOGGER.info("partnersItemDescription" + partnersItemDescription);
         model.addAttribute("response1", mvcResponseSender.createResponseString(partnersItemDescription));

Subversion Repositories SmartDukaan

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