WebSVN – SmartDukaan – Diff – /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/RbmTargetServiceImpl.java

         setSalesTargetsForDate(LocalDate.now());
+    }
     @Override
     public void setSalesTargetsForDate(LocalDate date) {
-        LocalDateTime dayStart = date.atStartOfDay();
+        // Sales target for a person = (own_monthly_target − MTD_own_achievement) /
-        LocalDateTime dayEnd = date.plusDays(1).atStartOfDay();
+        // remainingDays, then split by warehouse stock mix — exactly like RBM, but
-        // Persisted RBM snapshots for the target date (one row per RBM × warehouse).
+        // scoped to the Sales person's OWN assigned partners (no RBM roll-up).
-        List<RbmTargets> todayRbmSnapshots = rbmTargetsRepository.selectTargetsByDates(dayStart, dayEnd);
-        if (todayRbmSnapshots.isEmpty()) {
+        LocalDate monthStart = date.withDayOfMonth(1);
-            LOGGER.warn("setSalesTargetsForDate: no RBM snapshots for {}; run pushRbmTargets first", date);
+        int remainingWorkingDays = (int) getRemainingDaysInMonth(date);
-            return;
-        }
-        // Index snapshots by (rbmAuthId, warehouseId) for O(1) roll-up.
+        // Warehouse-level stock mix (same source used by setMovementWiseRbmTargets).
-        // rbm_auth_id → warehouseId → snapshot row.
-        Map<Integer, Map<Integer, RbmTargets>> byRbmByWh = new HashMap<>();
+        Map<Integer, WarehouseMobileStockByMovementModel> whStockByWh = new HashMap<>();
-        for (RbmTargets s : todayRbmSnapshots) {
+        for (WarehouseMobileStockByMovementModel s : getWarehouseMobileStockByMovement()) {
-            byRbmByWh.computeIfAbsent(s.getRbmAuthId(), k -> new HashMap<>()).put(s.getWarehouseId(), s);
+            whStockByWh.put(s.getWarehouseId(), s);
+        }
-        Set<Integer> allSnapshotRbms = byRbmByWh.keySet();
-        // Sales roles + their (categoryId, escalationType) mapping — mirrors
-        // MonitorController /indent/today_po_table_fragment so both places agree.
         String[][] roles = {
                 {"ASM", "4", "L1"}, {"CM", "4", "L2"}, {"DM", "4", "L3"},
                 {"BM", "4", "L4"}, {"RSM", "4", "L5"}, {"NSM", "4", "L6"}
         };
-        int written = 0;
-        // Stamp rows within the target day so date-range queries pick them up
-        // for the right day, even during backfill of a past date.
         LocalDate today = LocalDate.now();
         LocalDateTime stamp = date.equals(today) ? LocalDateTime.now() : date.atTime(java.time.LocalTime.NOON);
+        int written = 0, zeroTargetSkipped = 0;
         for (String[] r : roles) {
             String role = r[0];
             int catId = Integer.parseInt(r[1]);
-            EscalationType level = EscalationType.valueOf(r[2]);
-            for (AuthUser sales : csService.getAuthUserByCategoryId(catId, level)) {
-                if (!sales.isActive()) continue;
+            String levelStr = r[2];
-                // Downline authIds (includes self; we skip self since Sales users
+            // Monthly target per (authId × warehouse) for this role.
-                // aren't RBMs and won't appear in snapshot).
+            // Use the target date's month so backfills for past months work correctly.
-                Set<Integer> downline = new HashSet<>();
-                downline.add(sales.getId());
-                List<Integer> reportees = authService.getAllReportees(sales.getId());
+            List<SalesHierarchyMonthlyTargetModel> monthlyTgts = getSalesMonthlyTargetByRole(catId, levelStr, date);
-                if (reportees != null) downline.addAll(reportees);
+            if (monthlyTgts.isEmpty()) continue;
-                downline.retainAll(allSnapshotRbms);  // keep only RBMs with today's snapshot
-                if (downline.isEmpty()) continue;      // no RBMs under this Sales person today
-                // Aggregate per warehouse across the downline RBMs.
+            // MTD achieved per (authId × warehouse) for this role. Same-day date range → MTD.
-                Map<Integer, float[]> perWh = new LinkedHashMap<>();  // wh → [hid, fast, run, slow, other]
-                for (int rbmAuthId : downline) {
+            Map<String, Double> mtdByKey = new HashMap<>();
-                    Map<Integer, RbmTargets> whMap = byRbmByWh.get(rbmAuthId);
-                    if (whMap == null) continue;
+            for (SalesHierarchyAchievedByMovementModel a :
-                    for (Map.Entry<Integer, RbmTargets> e : whMap.entrySet()) {
+                    getSalesAchievementByRole(catId, levelStr, monthStart, date.plusDays(1))) {
-                        RbmTargets t = e.getValue();
+                double totBilled =
-                        float[] acc = perWh.computeIfAbsent(e.getKey(), k -> new float[5]);
-                        acc[0] += t.getHidTarget();
+                        a.getHidBilled()
-                        acc[1] += t.getFastMovingTarget();
+                                + a.getFastMovingBilled()
-                        acc[2] += t.getRunningtarget();
+                                + (a.getRunningBilled() != null ? a.getRunningBilled() : 0)
-                        acc[3] += t.getSlowMovingtarget();
+                                + (a.getSlowMovingBilled() != null ? a.getSlowMovingBilled() : 0)
-                        acc[4] += t.getOtherTarget();
+                                + (a.getOtherBilled() != null ? a.getOtherBilled() : 0);
-                    }
+                mtdByKey.merge(a.getAuthId() + "-" + a.getWarehouseId(), totBilled, Double::sum);
-                }
+            }
-                for (Map.Entry<Integer, float[]> e : perWh.entrySet()) {
+            for (SalesHierarchyMonthlyTargetModel mt : monthlyTgts) {
-                    float[] acc = e.getValue();
-                    SalesTargets st = new SalesTargets();
-                    st.setSalesAuthId(sales.getId());
-                    st.setSalesName(sales.getFullName());
-                    st.setRole(role);
-                    st.setWarehouseId(e.getKey());
-                    st.setHidTarget(acc[0]);
-                    st.setFastMovingTarget(acc[1]);
-                    st.setRunningTarget(acc[2]);
+                if (mt.getMonthlyTarget() <= 0) {
-                    st.setSlowMovingTarget(acc[3]);
-                    st.setOtherTarget(acc[4]);
+                    zeroTargetSkipped++;
-                    st.setCreateTimestamp(stamp);
-                    salesTargetsRepository.persist(st);
-                    written++;
+                    continue;
+                }
+                double achieved = mtdByKey.getOrDefault(mt.getAuthId() + "-" + mt.getWarehouseId(), 0.0);
+                double remaining = mt.getMonthlyTarget() - achieved;
+                double todayTarget = (remainingWorkingDays > 0 && remaining > 0)
+                        ? remaining / remainingWorkingDays : 0;
+                WarehouseMobileStockByMovementModel stock = whStockByWh.get(mt.getWarehouseId());
+                if (stock == null || stock.getTotalAvailabilityPrice() <= 0) continue;
+                float total = stock.getTotalAvailabilityPrice();
+                SalesTargets st = new SalesTargets();
+                st.setSalesAuthId(mt.getAuthId());
+                st.setSalesName(mt.getName());
+                st.setRole(role);
+                st.setWarehouseId(mt.getWarehouseId());
+                st.setHidTarget((float) ((stock.getTotalHidCatalogPrice() / total) * todayTarget));
+                st.setFastMovingTarget((float) ((stock.getTotalFastMovingCatalogPrice() / total) * todayTarget));
+                st.setSlowMovingTarget((float) ((stock.getTotalSlowMovingCatalogPrice() / total) * todayTarget));
+                st.setRunningTarget((float) ((stock.getTotalRunningCatalogPrice() / total) * todayTarget));
+                st.setOtherTarget((float) ((stock.getTotalOtherCategoryCatalogPrice() / total) * todayTarget));
+                st.setCreateTimestamp(stamp);
+                salesTargetsRepository.persist(st);
+                written++;
+            }
+        }
-        LOGGER.info("setSalesTargetsForDate: wrote {} sales_targets rows for {}", written, date);
+        LOGGER.info("setSalesTargetsForDate: wrote {} sales_targets rows for {} ({} rows skipped due to zero monthly target)",
+                written, date, zeroTargetSkipped);
+    }
     @Override
     public List<SalesTargets> getSalesTargetsByDates(LocalDate startDate, LocalDate endDate) {
         return salesTargetsRepository.selectTargetsByDates(startDate.atStartOfDay(), endDate.atStartOfDay());
+    }
     @Override
+    public List<SalesHierarchyAchievedByMovementModel> getSalesAchievementByRole(
+            int categoryId, String escalationType, LocalDate startDate, LocalDate endDate) {
+        Session session = sessionFactory.getCurrentSession();
+        TypedQuery<SalesHierarchyAchievedByMovementModel> q = session.createNamedQuery(
+                "RbmDrr.SalesHierarchyAchievedByMovement", SalesHierarchyAchievedByMovementModel.class);
+        q.setParameter("categoryId", categoryId);
+        q.setParameter("escalationType", escalationType);
+        q.setParameter("startDate", startDate);
+        q.setParameter("endDate", endDate);
+        return q.getResultList();
+    }
+    @Override
+    public List<SalesHierarchyMonthlyTargetModel> getSalesMonthlyTargetByRole(
+            int categoryId, String escalationType, LocalDate refDate) {
+        Session session = sessionFactory.getCurrentSession();
+        TypedQuery<SalesHierarchyMonthlyTargetModel> q = session.createNamedQuery(
+                "RbmDrr.SalesHierarchyMonthlyTarget", SalesHierarchyMonthlyTargetModel.class);
+        q.setParameter("categoryId", categoryId);
+        q.setParameter("escalationType", escalationType);
+        q.setParameter("refDate", refDate);
+        return q.getResultList();
+    }
+    @Override
     public void setSalesAchievements() {
         setSalesAchievementsForDate(LocalDate.now());
+    }
     @Override
     public void setSalesAchievementsForDate(LocalDate date) {
-        // ACH per (RBM authId × warehouse) for the target date, from the live
+        // Sales ACH per (auth × warehouse) — direct query scoped to each Sales
-        // order SQL. Same source used everywhere else.
+        // person's OWN partners (no RBM roll-up). Same source-of-truth orders SQL.
-        List<TodayAchievedMovementModel> achModels =
-                getMovementWiseAchievementByDate(date, date.plusDays(1));
-        if (achModels.isEmpty()) {
-            LOGGER.warn("setSalesAchievementsForDate: no orders on {}; nothing to snapshot", date);
-            return;
-        }
-        // Sales roles + (categoryId, escalationType) — same mapping used elsewhere.
         String[][] roles = {
                 {"ASM", "4", "L1"}, {"CM", "4", "L2"}, {"DM", "4", "L3"},
                 {"BM", "4", "L4"}, {"RSM", "4", "L5"}, {"NSM", "4", "L6"}
         };
-        // Stamp within the target date so date-range queries pick these rows
-        // up for the correct day even during backfill.
         LocalDate today = LocalDate.now();
         LocalDateTime stamp = date.equals(today) ? LocalDateTime.now() : date.atTime(java.time.LocalTime.NOON);
         int written = 0;
         for (String[] r : roles) {
             String role = r[0];
             int catId = Integer.parseInt(r[1]);
-            EscalationType level = EscalationType.valueOf(r[2]);
-            for (AuthUser sales : csService.getAuthUserByCategoryId(catId, level)) {
-                if (!sales.isActive()) continue;
-                // Downline authIds (include self).
-                Set<Integer> downline = new HashSet<>();
-                downline.add(sales.getId());
+            String levelStr = r[2];
-                List<Integer> reportees = authService.getAllReportees(sales.getId());
-                if (reportees != null) downline.addAll(reportees);
-                // Aggregate ACH per warehouse across downline RBMs.
-                Map<Integer, float[]> perWh = new LinkedHashMap<>();  // wh → [hid, fast, run, slow, other]
-                for (TodayAchievedMovementModel a : achModels) {
-                    if (!downline.contains(a.getAuthId())) continue;
-                    float[] acc = perWh.computeIfAbsent(a.getWarehouseId(), k -> new float[5]);
-                    acc[0] += a.getHidBilled();
-                    acc[1] += a.getFastMovingBilled();
-                    acc[2] += a.getRunningBilled() != null ? a.getRunningBilled() : 0f;
-                    acc[3] += a.getSlowMovinBilled() != null ? a.getSlowMovinBilled() : 0f;
-                    acc[4] += a.getOtherBilled() != null ? a.getOtherBilled() : 0f;
-                }
-                if (perWh.isEmpty()) continue;
-                for (Map.Entry<Integer, float[]> e : perWh.entrySet()) {
+            for (SalesHierarchyAchievedByMovementModel a :
-                    float[] acc = e.getValue();
+                    getSalesAchievementByRole(catId, levelStr, date, date.plusDays(1))) {
-                    SalesAchievements sa = new SalesAchievements();
+                SalesAchievements sa = new SalesAchievements();
-                    sa.setSalesAuthId(sales.getId());
+                sa.setSalesAuthId(a.getAuthId());
-                    sa.setSalesName(sales.getFullName());
+                sa.setSalesName(a.getName());
-                    sa.setRole(role);
+                sa.setRole(role);
-                    sa.setWarehouseId(e.getKey());
+                sa.setWarehouseId(a.getWarehouseId());
-                    sa.setAchievedHidTarget(acc[0]);
+                sa.setAchievedHidTarget(a.getHidBilled());
-                    sa.setAchievedFastMovingTarget(acc[1]);
+                sa.setAchievedFastMovingTarget(a.getFastMovingBilled());
-                    sa.setAchievedRunningTarget(acc[2]);
+                sa.setAchievedRunningTarget(a.getRunningBilled() != null ? a.getRunningBilled() : 0f);
-                    sa.setAchievedSlowMovingTarget(acc[3]);
+                sa.setAchievedSlowMovingTarget(a.getSlowMovingBilled() != null ? a.getSlowMovingBilled() : 0f);
-                    sa.setAchievedOtherTarget(acc[4]);
+                sa.setAchievedOtherTarget(a.getOtherBilled() != null ? a.getOtherBilled() : 0f);
-                    sa.setCreateTimestamp(stamp);
+                sa.setCreateTimestamp(stamp);
-                    salesAchievementsRepository.persist(sa);
+                salesAchievementsRepository.persist(sa);
-                    written++;
+                written++;
-                }
+            }
+        }
         LOGGER.info("setSalesAchievementsForDate: wrote {} sales_achievements rows for {}", written, date);
+    }

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/RbmTargetServiceImpl.java – Rev 37497 → 37505