Subversion Repositories SmartDukaan

Rev

Rev 34282 | Rev 34284 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 34282 Rev 34283
Line 266... Line 266...
266
 
266
 
267
                String warehouseName = ProfitMandiConstants.WAREHOUSE_MAP.getOrDefault(rbmTarget.getWarehouseId(), "Unknown");
267
                String warehouseName = ProfitMandiConstants.WAREHOUSE_MAP.getOrDefault(rbmTarget.getWarehouseId(), "Unknown");
268
 
268
 
269
                LOGGER.info("rbmTarget {}", rbmTarget);
269
                LOGGER.info("rbmTarget {}", rbmTarget);
270
 
270
 
-
 
271
                TodayAchievedMovementModel todayAchievedMovementModel = null;
-
 
272
 
-
 
273
                if (todayAchievedMovementModels.stream().filter(x -> x.getAuthId() == rbmTarget.getAuthId() && x.getWarehouseId() == rbmTarget.getWarehouseId()) != null) {
271
                TodayAchievedMovementModel todayAchievedMovementModel = todayAchievedMovementModels.stream().filter(x -> x.getAuthId() == rbmTarget.getAuthId() && x.getWarehouseId() == rbmTarget.getWarehouseId()).findFirst().get();
274
                    todayAchievedMovementModel = todayAchievedMovementModels.stream().filter(x -> x.getAuthId() == rbmTarget.getAuthId() && x.getWarehouseId() == rbmTarget.getWarehouseId()).findFirst().get();
-
 
275
                }
272
 
276
 
273
                Optional<RbmTargets> optionalTodayRbmTargets = todayRbmTargetsList.stream()
277
                Optional<RbmTargets> optionalTodayRbmTargets = todayRbmTargetsList.stream()
274
                        .filter(x -> x.getRbmAuthId() == rbmTarget.getAuthId() && x.getWarehouseId() == rbmTarget.getWarehouseId())
278
                        .filter(x -> x.getRbmAuthId() == rbmTarget.getAuthId() && x.getWarehouseId() == rbmTarget.getWarehouseId())
275
                        .findFirst();
279
                        .findFirst();
276
 
280
 
Line 290... Line 294...
290
                    viewModel.setTodayFastMovingTarget(Math.round(todayRbmTargets.getFastMovingTarget()));
294
                    viewModel.setTodayFastMovingTarget(Math.round(todayRbmTargets.getFastMovingTarget()));
291
                    viewModel.setTodaySlowMovingTarget(Math.round(todayRbmTargets.getSlowMovingtarget()));
295
                    viewModel.setTodaySlowMovingTarget(Math.round(todayRbmTargets.getSlowMovingtarget()));
292
                    viewModel.setTodayRunningTarget(Math.round(todayRbmTargets.getRunningtarget()));
296
                    viewModel.setTodayRunningTarget(Math.round(todayRbmTargets.getRunningtarget()));
293
                    viewModel.setTodayOtherMovingTarget(Math.round(todayRbmTargets.getOtherTarget()));
297
                    viewModel.setTodayOtherMovingTarget(Math.round(todayRbmTargets.getOtherTarget()));
294
 
298
 
295
                    viewModel.setTodayAchievedHidTarget(Math.round(todayAchievedMovementModel.getHidBilled()));
299
                    if (todayAchievedMovementModel != null) {
296
                    viewModel.setTodayAchievedFastMovingTarget(Math.round(todayAchievedMovementModel.getFastMovingBilled()));
300
                        viewModel.setTodayAchievedHidTarget(Math.round(todayAchievedMovementModel.getHidBilled()));
297
                    viewModel.setTodayAchievedSlowMovingTarget(Math.round(todayAchievedMovementModel.getSlowMovinBilled()));
301
                        viewModel.setTodayAchievedFastMovingTarget(Math.round(todayAchievedMovementModel.getFastMovingBilled()));
298
                    viewModel.setTodayAchievedRunningTarget(Math.round(todayAchievedMovementModel.getRunningBilled()));
302
                        viewModel.setTodayAchievedSlowMovingTarget(Math.round(todayAchievedMovementModel.getSlowMovinBilled()));
299
                    viewModel.setTodayAchievedOtherMovingTarget(Math.round(todayAchievedMovementModel.getOtherBilled()));
303
                        viewModel.setTodayAchievedRunningTarget(Math.round(todayAchievedMovementModel.getRunningBilled()));
300
                    viewModel.setTotalAchievedTarget(Math.round(todayAchievedMovementModel.getHidBilled() + todayAchievedMovementModel.getFastMovingBilled() + todayAchievedMovementModel.getSlowMovinBilled() + todayAchievedMovementModel.getRunningBilled() + todayAchievedMovementModel.getOtherBilled()));
304
                        viewModel.setTodayAchievedOtherMovingTarget(Math.round(todayAchievedMovementModel.getOtherBilled()));
301
 
305
                        viewModel.setTotalAchievedTarget(Math.round(todayAchievedMovementModel.getHidBilled() + todayAchievedMovementModel.getFastMovingBilled() + todayAchievedMovementModel.getSlowMovinBilled() + todayAchievedMovementModel.getRunningBilled() + todayAchievedMovementModel.getOtherBilled()));
-
 
306
                    } else {
-
 
307
                        viewModel.setTodayAchievedHidTarget(0);
-
 
308
                        viewModel.setTodayAchievedFastMovingTarget(0);
-
 
309
                        viewModel.setTodayAchievedSlowMovingTarget(0);
-
 
310
                        viewModel.setTodayAchievedRunningTarget(0);
-
 
311
                        viewModel.setTodayAchievedOtherMovingTarget(0);
-
 
312
                        viewModel.setTotalAchievedTarget(0);
-
 
313
                    }
302
                    rbmArrViewModels.add(viewModel);
314
                    rbmArrViewModels.add(viewModel);
303
                } else {
315
                } else {
304
                    LOGGER.info("No matching RbmTargets found for AuthId: {} and rbmname {} and WarehouseId: {}", rbmTarget.getAuthId(), rbmTarget.getRbmName(), rbmTarget.getWarehouseId());
316
                    LOGGER.info("No matching RbmTargets found for AuthId: {} and rbmname {} and WarehouseId: {}", rbmTarget.getAuthId(), rbmTarget.getRbmName(), rbmTarget.getWarehouseId());
305
                }
317
                }
306
 
318