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

 import com.spice.profitmandi.common.exception.ProfitMandiBusinessException;
 import com.spice.profitmandi.common.model.*;
 import com.spice.profitmandi.common.util.FileUtil;
 import com.spice.profitmandi.common.util.Utils.Attachment;
 import com.spice.profitmandi.common.web.util.ResponseSender;
-import com.spice.profitmandi.service.mail.MailOutboxService;
 import com.spice.profitmandi.dao.entity.auth.AuthUser;
 import com.spice.profitmandi.dao.entity.catalog.*;
 import com.spice.profitmandi.dao.entity.cs.Region;
 import com.spice.profitmandi.dao.entity.fofo.*;
 import com.spice.profitmandi.dao.entity.inventory.SaholicCISTable;
 import com.spice.profitmandi.dao.entity.inventory.SaholicPOItem;
 import com.spice.profitmandi.dao.entity.transaction.Loan;
 import com.spice.profitmandi.dao.entity.transaction.Order;
 import com.spice.profitmandi.dao.entity.transaction.SDCreditRequirement;
-import com.spice.profitmandi.dao.model.BulkCreditSummary;
-import com.spice.profitmandi.service.transaction.SDCreditService;
 import com.spice.profitmandi.dao.entity.transaction.UserWallet;
 import com.spice.profitmandi.dao.entity.warehouse.BrandRegionMapping;
 import com.spice.profitmandi.dao.enumuration.cs.EscalationType;
 import com.spice.profitmandi.dao.enumuration.inventory.CatalogMovingEnum;
 import com.spice.profitmandi.dao.event.TagListingEventPublisher;
 import com.spice.profitmandi.service.NotificationService;
 import com.spice.profitmandi.service.RbmTargetService;
 import com.spice.profitmandi.service.authentication.RoleManager;
 import com.spice.profitmandi.service.catalog.BrandsService;
 import com.spice.profitmandi.service.inventory.*;
+import com.spice.profitmandi.service.mail.MailOutboxService;
+import com.spice.profitmandi.service.transaction.SDCreditService;
 import com.spice.profitmandi.service.user.RetailerService;
 import com.spice.profitmandi.service.wallet.WalletService;
 import com.spice.profitmandi.web.model.LoginDetails;
 import com.spice.profitmandi.web.util.CookiesProcessor;
 import com.spice.profitmandi.web.util.MVCResponseSender;
         Map<Integer, CatalogAgingModel> catalogAgingModelMap = catalogAgingModels.stream().collect(Collectors.toMap(x -> x.getCatalogId(), x -> x));
         List<PartnerWarehouseStockAgingSummaryModel> partnerWarehouseStockAgingSummaryModelList = new ArrayList<>();
+        // Tier-aware floor for P-Fullfilled: partners must always be suggested
+        // at least a minimum quantity per SKU based on their tier. If the raw
+        // opening_qty from fofo_opening_stock is below the floor, we show the
+        // floor instead (this also gives red rows / never-held SKUs a real
+        // number to act on). P-Shortage is recomputed against the effective
+        // P-Fullfilled so the two columns stay consistent.
+        //   GOLD / NEW / (fallback)    → 3
+        //   DIAMOND / PLATINUM         → 5
+        //   SILVER / BRONZE            → 2
+        int tierFloor;
+        PartnerTypeChange partnerTypeChangeForFloor = partnerTypeChangeRepository.getRecentChange(fofoId, LocalDate.now());
+        PartnerType partnerTierForFloor = partnerTypeChangeForFloor != null ? partnerTypeChangeForFloor.getPartnerType() : null;
+        if (partnerTierForFloor == PartnerType.DIAMOND || partnerTierForFloor == PartnerType.PLATINUM) {
+            tierFloor = 5;
+        } else if (partnerTierForFloor == PartnerType.SILVER || partnerTierForFloor == PartnerType.BRONZE) {
+            tierFloor = 2;
+        } else {
+            tierFloor = 3;
+        }
         for (PartnerWarehouseStockSummaryModel stockSummary : partnerWarehouseStockSummaryModels) {
             PartnerWarehouseStockAgingSummaryModel partnerWarehouseStockAgingSummaryModel = new PartnerWarehouseStockAgingSummaryModel();
             partnerWarehouseStockAgingSummaryModel.setCatalogId(stockSummary.getCatalogId());
             partnerWarehouseStockAgingSummaryModel.setBrand(stockSummary.getBrand());
             partnerWarehouseStockAgingSummaryModel.setModelNumber(stockSummary.getModelNumber());
             partnerWarehouseStockAgingSummaryModel.setNetAvailability(stockSummary.getShaholicNetAvailability());
+            int effectivePFullfilled = Math.max(stockSummary.getPartnerFullFilledQty(), tierFloor);
+            int currentQty = stockSummary.getPartnerCurrentQty();
-            partnerWarehouseStockAgingSummaryModel.setPartnerStockAvailability(stockSummary.getPartnerFullFilledQty());
+            partnerWarehouseStockAgingSummaryModel.setPartnerStockAvailability(effectivePFullfilled);
-            partnerWarehouseStockAgingSummaryModel.setPartnerCurrentAvailability(stockSummary.getPartnerCurrentQty());
+            partnerWarehouseStockAgingSummaryModel.setPartnerCurrentAvailability(currentQty);
-            partnerWarehouseStockAgingSummaryModel.setPartnerShortageStock(stockSummary.getPartnerShortageQty());
+            partnerWarehouseStockAgingSummaryModel.setPartnerShortageStock(Math.max(effectivePFullfilled - currentQty, 0));
             if (catalogAgingModelMap.get(stockSummary.getCatalogId()) != null) {
                 partnerWarehouseStockAgingSummaryModel.setExceedDays(catalogAgingModelMap.get(stockSummary.getCatalogId()).getExceedDays());
             } else {
                 partnerWarehouseStockAgingSummaryModel.setExceedDays(0);
                     PartnerWarehouseStockAgingSummaryModel agingModel = new PartnerWarehouseStockAgingSummaryModel();
                     agingModel.setCatalogId(intransitStock.getCatalogId());
                     agingModel.setBrand(intransitStock.getBrand());
                     agingModel.setModelNumber(intransitStock.getModelNumber());
                     agingModel.setNetAvailability(0); // Not part of original aging summary
+                    int intransitEffectivePFullfilled = Math.max(intransitStock.getPartnerFullFilledQty(), tierFloor);
+                    int intransitCurrentQty = intransitStock.getPartnerCurrentQty();
-                    agingModel.setPartnerStockAvailability(intransitStock.getPartnerFullFilledQty());
+                    agingModel.setPartnerStockAvailability(intransitEffectivePFullfilled);
-                    agingModel.setPartnerCurrentAvailability(intransitStock.getPartnerCurrentQty());
+                    agingModel.setPartnerCurrentAvailability(intransitCurrentQty);
-                    agingModel.setPartnerShortageStock(intransitStock.getPartnerShortageQty());
+                    agingModel.setPartnerShortageStock(Math.max(intransitEffectivePFullfilled - intransitCurrentQty, 0));
                     if (catalogAgingModelMap.get(intransitStock.getCatalogId()) != null) {
                         agingModel.setExceedDays(catalogAgingModelMap.get(intransitStock.getCatalogId()).getExceedDays());
                     } else {
                         agingModel.setExceedDays(0);
+                    }

Subversion Repositories SmartDukaan

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