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



 
        LocalDate startDateOfMonthDay1 = LocalDate.now().withDayOfMonth(1);
 
        List<WarehouseRbmTargetModel> warehouseRbmTargetModels = this.getWarehouseWiseRbmMonthlyTarget();
 
        List<TodayAchievedMovementModel> todayAchievedMovementModels = getTodayTargetByMovement(todayDate.minusDays(3), todayDate.minusDays(2));
 
        List<MTDAchievedTargetModel> mtdAchievedTargetModels = getDateWiseAchievedTargetOfRbm(startDateOfMonthDay1, todayDate);
 
        int remainingWorkingDaysCount = getWorkingDaysCount(todayDate);
 

                    .filter(x -> x.getAuthId() == rbmTarget.getAuthId() && x.getWarehouseId() == rbmTarget.getWarehouseId())
                    .mapToDouble(MTDAchievedTargetModel::getAcheivedMonthlyTarget)
                    .sum();
 
            float remainingTarget = monthlyTarget - achievedSoFar;
 
            float todayTarget = (remainingWorkingDaysCount > 0 && remainingTarget > 0) ? remainingTarget / remainingWorkingDaysCount : 0;
 
                String warehouseName = ProfitMandiConstants.WAREHOUSE_MAP.getOrDefault(rbmTarget.getWarehouseId(), "Unknown");
 
                TodayAchievedMovementModel todayAchievedMovementModel = todayAchievedMovementModels.stream().filter(x -> x.getAuthId() == rbmTarget.getAuthId() && x.getWarehouseId() == rbmTarget.getWarehouseId()).findFirst().get();
 

                viewModel.setTodayAchievedOtherMovingTarget(Math.round(todayAchievedMovementModel.getOtherBilled()));
                viewModel.setTotalAchievedTarget(Math.round(todayAchievedMovementModel.getHidBilled() + todayAchievedMovementModel.getFastMovingBilled() + todayAchievedMovementModel.getSlowMovingBilled() + todayAchievedMovementModel.getEolBilled() + todayAchievedMovementModel.getOtherBilled()));
 
                rbmArrViewModels.add(viewModel);
 
 
        }
 
        LOGGER.info("rbmArrViewModels {}", rbmArrViewModels);
        return rbmArrViewModels;
    }

                    .mapToDouble(MTDAchievedTargetModel::getAcheivedMonthlyTarget)
                    .sum();
 
 
            float remainingTarget = monthlyTarget - achievedSoFar;
            LOGGER.info("remainingTarget {}", remainingTarget);
 
            float todayTarget = (remainingWorkingDaysCount > 0 && remainingTarget > 0) ? remainingTarget / remainingWorkingDaysCount : 0;
            LOGGER.info("todayTarget {}", todayTarget);
 
            // Get the warehouse stock data
            WarehouseMobileStockByMovementModel warehouseMobileStockByMovementModel = warehouseMobileStockByMovementModels.stream()
                    .filter(x -> x.getWarehouseId() == rbmTarget.getWarehouseId()).findFirst().orElse(null);
 

Subversion Repositories SmartDukaan

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

Rev 33926		Rev 33953
Line 104...		Line 104...
104		104
105	`LocalDate startDateOfMonthDay1 = LocalDate.now().withDayOfMonth(1);`	105	`LocalDate startDateOfMonthDay1 = LocalDate.now().withDayOfMonth(1);`
106		106
107	`List<WarehouseRbmTargetModel> warehouseRbmTargetModels = this.getWarehouseWiseRbmMonthlyTarget();`	107	`List<WarehouseRbmTargetModel> warehouseRbmTargetModels = this.getWarehouseWiseRbmMonthlyTarget();`
108		108
109	`List<TodayAchievedMovementModel> todayAchievedMovementModels = getTodayTargetByMovement(todayDate, todayDate.plusDays(1));`	109	`List<TodayAchievedMovementModel> todayAchievedMovementModels = getTodayTargetByMovement(todayDate.minusDays(3), todayDate.minusDays(2));`
110		110
111	`List<MTDAchievedTargetModel> mtdAchievedTargetModels = getDateWiseAchievedTargetOfRbm(startDateOfMonthDay1, todayDate);`	111	`List<MTDAchievedTargetModel> mtdAchievedTargetModels = getDateWiseAchievedTargetOfRbm(startDateOfMonthDay1, todayDate);`
112		112
113	`int remainingWorkingDaysCount = getWorkingDaysCount(todayDate);`	113	`int remainingWorkingDaysCount = getWorkingDaysCount(todayDate);`
114		114
Line 125...		Line 125...
125	`.filter(x -> x.getAuthId() == rbmTarget.getAuthId() && x.getWarehouseId() == rbmTarget.getWarehouseId())`	125	`.filter(x -> x.getAuthId() == rbmTarget.getAuthId() && x.getWarehouseId() == rbmTarget.getWarehouseId())`
126	`.mapToDouble(MTDAchievedTargetModel::getAcheivedMonthlyTarget)`	126	`.mapToDouble(MTDAchievedTargetModel::getAcheivedMonthlyTarget)`
127	`.sum();`	127	`.sum();`
128		128
129	`float remainingTarget = monthlyTarget - achievedSoFar;`	129	`float remainingTarget = monthlyTarget - achievedSoFar;`
-		130
130	`float todayTarget = remainingWorkingDaysCount > 0 ? remainingTarget / remainingWorkingDaysCount : 0;`	131	`float todayTarget = (remainingWorkingDaysCount > 0 && remainingTarget > 0) ? remainingTarget / remainingWorkingDaysCount : 0;`
131		132
132	`String warehouseName = ProfitMandiConstants.WAREHOUSE_MAP.getOrDefault(rbmTarget.getWarehouseId(), "Unknown");`	133	`String warehouseName = ProfitMandiConstants.WAREHOUSE_MAP.getOrDefault(rbmTarget.getWarehouseId(), "Unknown");`
133		134
134	`TodayAchievedMovementModel todayAchievedMovementModel = todayAchievedMovementModels.stream().filter(x -> x.getAuthId() == rbmTarget.getAuthId() && x.getWarehouseId() == rbmTarget.getWarehouseId()).findFirst().get();`	135	`TodayAchievedMovementModel todayAchievedMovementModel = todayAchievedMovementModels.stream().filter(x -> x.getAuthId() == rbmTarget.getAuthId() && x.getWarehouseId() == rbmTarget.getWarehouseId()).findFirst().get();`
135		136
Line 158...		Line 159...
158	`viewModel.setTodayAchievedOtherMovingTarget(Math.round(todayAchievedMovementModel.getOtherBilled()));`	159	`viewModel.setTodayAchievedOtherMovingTarget(Math.round(todayAchievedMovementModel.getOtherBilled()));`
159	`viewModel.setTotalAchievedTarget(Math.round(todayAchievedMovementModel.getHidBilled() + todayAchievedMovementModel.getFastMovingBilled() + todayAchievedMovementModel.getSlowMovingBilled() + todayAchievedMovementModel.getEolBilled() + todayAchievedMovementModel.getOtherBilled()));`	160	`viewModel.setTotalAchievedTarget(Math.round(todayAchievedMovementModel.getHidBilled() + todayAchievedMovementModel.getFastMovingBilled() + todayAchievedMovementModel.getSlowMovingBilled() + todayAchievedMovementModel.getEolBilled() + todayAchievedMovementModel.getOtherBilled()));`
160		161
161	`rbmArrViewModels.add(viewModel);`	162	`rbmArrViewModels.add(viewModel);`
162		163
163		-
164	`}`	164	`}`
165		165
166	`LOGGER.info("rbmArrViewModels {}", rbmArrViewModels);`	166	`LOGGER.info("rbmArrViewModels {}", rbmArrViewModels);`
167	`return rbmArrViewModels;`	167	`return rbmArrViewModels;`
168	`}`	168	`}`
Line 190...		Line 190...
190	`.mapToDouble(MTDAchievedTargetModel::getAcheivedMonthlyTarget)`	190	`.mapToDouble(MTDAchievedTargetModel::getAcheivedMonthlyTarget)`
191	`.sum();`	191	`.sum();`
192		192
193		193
194	`float remainingTarget = monthlyTarget - achievedSoFar;`	194	`float remainingTarget = monthlyTarget - achievedSoFar;`
-		195	`LOGGER.info("remainingTarget {}", remainingTarget);`
-		196
195	`float todayTarget = remainingWorkingDaysCount > 0 ? remainingTarget / remainingWorkingDaysCount : 0;`	197	`float todayTarget = (remainingWorkingDaysCount > 0 && remainingTarget > 0) ? remainingTarget / remainingWorkingDaysCount : 0;`
-		198	`LOGGER.info("todayTarget {}", todayTarget);`
196		199
197	`// Get the warehouse stock data`	200	`// Get the warehouse stock data`
198	`WarehouseMobileStockByMovementModel warehouseMobileStockByMovementModel = warehouseMobileStockByMovementModels.stream()`	201	`WarehouseMobileStockByMovementModel warehouseMobileStockByMovementModel = warehouseMobileStockByMovementModels.stream()`
199	`.filter(x -> x.getWarehouseId() == rbmTarget.getWarehouseId()).findFirst().orElse(null);`	202	`.filter(x -> x.getWarehouseId() == rbmTarget.getWarehouseId()).findFirst().orElse(null);`
200		203