Subversion Repositories SmartDukaan

Rev

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

Rev 34056 Rev 34098
Line 156... Line 156...
156
                    model.setRbmName(target.getRbmName());
156
                    model.setRbmName(target.getRbmName());
157
                    model.setWarehouseName(ProfitMandiConstants.WAREHOUSE_MAP.getOrDefault(warehouseId, "Unknown"));
157
                    model.setWarehouseName(ProfitMandiConstants.WAREHOUSE_MAP.getOrDefault(warehouseId, "Unknown"));
158
 
158
 
159
                    // Set target values
159
                    // Set target values
160
                    model.setHidTarget((long) target.getHidTarget());
160
                    model.setHidTarget((long) target.getHidTarget());
161
                    model.setEolTarget((long) target.getEolTarget());
161
                    model.setRunningTarget((long) target.getRunningTarget());
162
                    model.setFastMovingTarget((long) target.getFastMovingTarget());
162
                    model.setFastMovingTarget((long) target.getFastMovingTarget());
163
                    model.setSlowMovingTarget((long) target.getSlowMovingTarget());
163
                    model.setSlowMovingTarget((long) target.getSlowMovingTarget());
164
                    model.setOtherMovingTarget((long) target.getOtherTarget());
164
                    model.setOtherMovingTarget((long) target.getOtherTarget());
165
 
165
 
166
                    // Set achievement values
166
                    // Set achievement values
167
                    model.setAchievedHid((long) achievement.getAchievedHidTarget());
167
                    model.setAchievedHid((long) achievement.getAchievedHidTarget());
168
                    model.setAchievedEol((long) achievement.getAchievedEolTarget());
168
                    model.setAchievedRunning((long) achievement.getAchievedRunningTarget());
169
                    model.setAchievedFastMoving((long) achievement.getAchievedFastMovingTarget());
169
                    model.setAchievedFastMoving((long) achievement.getAchievedFastMovingTarget());
170
                    model.setAchievedSlowMoving((long) achievement.getAchievedSlowMovingTarget());
170
                    model.setAchievedSlowMoving((long) achievement.getAchievedSlowMovingTarget());
171
                    model.setAchievedOtherMoving((long) achievement.getAchievedOtherTarget());
171
                    model.setAchievedOtherMoving((long) achievement.getAchievedOtherTarget());
172
 
172
 
173
                    model.setTotalTarget(
173
                    model.setTotalTarget(
174
                            (long) target.getHidTarget() +
174
                            (long) target.getHidTarget() +
175
                                    (long) target.getEolTarget() +
175
                                    (long) target.getRunningTarget() +
176
                                    (long) target.getFastMovingTarget() +
176
                                    (long) target.getFastMovingTarget() +
177
                                    (long) target.getSlowMovingTarget() +
177
                                    (long) target.getSlowMovingTarget() +
178
                                    (long) target.getOtherTarget()
178
                                    (long) target.getOtherTarget()
179
                    );
179
                    );
180
                    model.setTotalAchievemnt(
180
                    model.setTotalAchievemnt(
181
                            (long) achievement.getAchievedHidTarget() +
181
                            (long) achievement.getAchievedHidTarget() +
182
                                    (long) achievement.getAchievedEolTarget() +
182
                                    (long) achievement.getAchievedRunningTarget() +
183
                                    (long) achievement.getAchievedFastMovingTarget() +
183
                                    (long) achievement.getAchievedFastMovingTarget() +
184
                                    (long) achievement.getAchievedSlowMovingTarget() +
184
                                    (long) achievement.getAchievedSlowMovingTarget() +
185
                                    (long) achievement.getAchievedOtherTarget()
185
                                    (long) achievement.getAchievedOtherTarget()
186
                    );
186
                    );
187
 
187
 
Line 201... Line 201...
201
                (a2.getFastMovingTarget()));
201
                (a2.getFastMovingTarget()));
202
 
202
 
203
        a1.setSlowMovingTarget((a1.getSlowMovingTarget()) +
203
        a1.setSlowMovingTarget((a1.getSlowMovingTarget()) +
204
                (a2.getSlowMovingTarget()));
204
                (a2.getSlowMovingTarget()));
205
 
205
 
206
        a1.setEolTarget((a1.getEolTarget()) +
206
        a1.setRunningTarget((a1.getRunningTarget()) +
207
                (a2.getEolTarget()));
207
                (a2.getRunningTarget()));
208
 
208
 
209
        a1.setOtherTarget((a1.getOtherTarget()) +
209
        a1.setOtherTarget((a1.getOtherTarget()) +
210
                (a2.getOtherTarget()));
210
                (a2.getOtherTarget()));
211
        return a1;
211
        return a1;
212
    }
212
    }
Line 214... Line 214...
214
    private RbmAchievementsModel mergeAchievements(RbmAchievementsModel a1, RbmAchievementsModel a2) {
214
    private RbmAchievementsModel mergeAchievements(RbmAchievementsModel a1, RbmAchievementsModel a2) {
215
        // Merge logic for achievements (aggregate the target and achieved values)
215
        // Merge logic for achievements (aggregate the target and achieved values)
216
        a1.setAchievedHidTarget((a1.getAchievedHidTarget()) +
216
        a1.setAchievedHidTarget((a1.getAchievedHidTarget()) +
217
                (a2.getAchievedHidTarget()));
217
                (a2.getAchievedHidTarget()));
218
 
218
 
219
        a1.setAchievedEolTarget((a1.getAchievedEolTarget()) +
219
        a1.setAchievedRunningTarget((a1.getAchievedRunningTarget()) +
220
                (a2.getAchievedEolTarget()));
220
                (a2.getAchievedRunningTarget()));
221
 
221
 
222
        a1.setAchievedFastMovingTarget((a1.getAchievedFastMovingTarget()) +
222
        a1.setAchievedFastMovingTarget((a1.getAchievedFastMovingTarget()) +
223
                (a2.getAchievedFastMovingTarget()));
223
                (a2.getAchievedFastMovingTarget()));
224
 
224
 
225
        a1.setAchievedSlowMovingTarget((a1.getAchievedSlowMovingTarget()) +
225
        a1.setAchievedSlowMovingTarget((a1.getAchievedSlowMovingTarget()) +
Line 284... Line 284...
284
                    viewModel.setMonthlyTarget(Math.round(monthlyTarget));
284
                    viewModel.setMonthlyTarget(Math.round(monthlyTarget));
285
                    viewModel.setMtdAchievedTarget(Math.round(achievedSoFar));
285
                    viewModel.setMtdAchievedTarget(Math.round(achievedSoFar));
286
 
286
 
287
                    viewModel.setTodayHidTarget(Math.round((todayRbmTargets.getHidTarget())));
287
                    viewModel.setTodayHidTarget(Math.round((todayRbmTargets.getHidTarget())));
288
                    viewModel.setTodayFastMovingTarget(Math.round(todayRbmTargets.getFastMovingTarget()));
288
                    viewModel.setTodayFastMovingTarget(Math.round(todayRbmTargets.getFastMovingTarget()));
289
                    viewModel.setTodaySlowMovingTarget(Math.round(todayRbmTargets.getSlowMovingTarget()));
289
                    viewModel.setTodaySlowMovingTarget(Math.round(todayRbmTargets.getSlowMovingtarget()));
290
                    viewModel.setTodayEolTarget(Math.round(todayRbmTargets.getEolTarget()));
290
                    viewModel.setTodayRunningTarget(Math.round(todayRbmTargets.getRunningtarget()));
291
                    viewModel.setTodayOtherMovingTarget(Math.round(todayRbmTargets.getOtherTarget()));
291
                    viewModel.setTodayOtherMovingTarget(Math.round(todayRbmTargets.getOtherTarget()));
292
 
292
 
293
                    viewModel.setTodayAchievedHidTarget(Math.round(todayAchievedMovementModel.getHidBilled()));
293
                    viewModel.setTodayAchievedHidTarget(Math.round(todayAchievedMovementModel.getHidBilled()));
294
                    viewModel.setTodayAchievedFastMovingTarget(Math.round(todayAchievedMovementModel.getFastMovingBilled()));
294
                    viewModel.setTodayAchievedFastMovingTarget(Math.round(todayAchievedMovementModel.getFastMovingBilled()));
295
                    viewModel.setTodayAchievedSlowMovingTarget(Math.round(todayAchievedMovementModel.getSlowMovingBilled()));
295
                    viewModel.setTodayAchievedSlowMovingTarget(Math.round(todayAchievedMovementModel.getSlowMovinBilled()));
296
                    viewModel.setTodayAchievedEolTarget(Math.round(todayAchievedMovementModel.getEolBilled()));
296
                    viewModel.setTodayAchievedRunningTarget(Math.round(todayAchievedMovementModel.getRunningBilled()));
297
                    viewModel.setTodayAchievedOtherMovingTarget(Math.round(todayAchievedMovementModel.getOtherBilled()));
297
                    viewModel.setTodayAchievedOtherMovingTarget(Math.round(todayAchievedMovementModel.getOtherBilled()));
298
                    viewModel.setTotalAchievedTarget(Math.round(todayAchievedMovementModel.getHidBilled() + todayAchievedMovementModel.getFastMovingBilled() + todayAchievedMovementModel.getSlowMovingBilled() + todayAchievedMovementModel.getEolBilled() + todayAchievedMovementModel.getOtherBilled()));
298
                    viewModel.setTotalAchievedTarget(Math.round(todayAchievedMovementModel.getHidBilled() + todayAchievedMovementModel.getFastMovingBilled() + todayAchievedMovementModel.getSlowMovinBilled() + todayAchievedMovementModel.getRunningBilled() + todayAchievedMovementModel.getOtherBilled()));
299
 
299
 
300
                    rbmArrViewModels.add(viewModel);
300
                    rbmArrViewModels.add(viewModel);
301
                } else {
301
                } else {
302
                    LOGGER.info("No matching RbmTargets found for AuthId: {} and rbmname {} and WarehouseId: {}", rbmTarget.getAuthId(), rbmTarget.getRbmName(), rbmTarget.getWarehouseId());
302
                    LOGGER.info("No matching RbmTargets found for AuthId: {} and rbmname {} and WarehouseId: {}", rbmTarget.getAuthId(), rbmTarget.getRbmName(), rbmTarget.getWarehouseId());
303
                }
303
                }
Line 353... Line 353...
353
 
353
 
354
                // Calculate target allocation based on stock value proportion
354
                // Calculate target allocation based on stock value proportion
355
                float hidTarget = (warehouseMobileStockByMovementModel.getTotalHidCatalogPrice() / totalStockValue) * todayTarget;
355
                float hidTarget = (warehouseMobileStockByMovementModel.getTotalHidCatalogPrice() / totalStockValue) * todayTarget;
356
                float fastMovingTarget = (warehouseMobileStockByMovementModel.getTotalFastMovingCatalogPrice() / totalStockValue) * todayTarget;
356
                float fastMovingTarget = (warehouseMobileStockByMovementModel.getTotalFastMovingCatalogPrice() / totalStockValue) * todayTarget;
357
                float slowMovingTarget = (warehouseMobileStockByMovementModel.getTotalSlowMovingCatalogPrice() / totalStockValue) * todayTarget;
357
                float slowMovingTarget = (warehouseMobileStockByMovementModel.getTotalSlowMovingCatalogPrice() / totalStockValue) * todayTarget;
358
                float eolTarget = (warehouseMobileStockByMovementModel.getTotalEolCatalogPrice() / totalStockValue) * todayTarget;
358
                float runningTarget = (warehouseMobileStockByMovementModel.getTotalRunningCatalogPrice() / totalStockValue) * todayTarget;
359
                float otherTarget = (warehouseMobileStockByMovementModel.getTotalOtherCategoryCatalogPrice() / totalStockValue) * todayTarget;
359
                float otherTarget = (warehouseMobileStockByMovementModel.getTotalOtherCategoryCatalogPrice() / totalStockValue) * todayTarget;
360
 
360
 
361
                RbmTargets rbmTargets = new RbmTargets();
361
                RbmTargets rbmTargets = new RbmTargets();
362
                rbmTargets.setWarehouseId(rbmTarget.getWarehouseId());
362
                rbmTargets.setWarehouseId(rbmTarget.getWarehouseId());
363
                rbmTargets.setRbmAuthId(rbmTarget.getAuthId());
363
                rbmTargets.setRbmAuthId(rbmTarget.getAuthId());
364
                rbmTargets.setRbmName(rbmTarget.getRbmName());
364
                rbmTargets.setRbmName(rbmTarget.getRbmName());
365
                rbmTargets.setEolTarget(eolTarget);
365
                rbmTargets.setRunningtarget(runningTarget);
366
                rbmTargets.setHidTarget(hidTarget);
366
                rbmTargets.setHidTarget(hidTarget);
367
                rbmTargets.setFastMovingTarget(fastMovingTarget);
367
                rbmTargets.setFastMovingTarget(fastMovingTarget);
368
                rbmTargets.setSlowMovingTarget(slowMovingTarget);
368
                rbmTargets.setSlowMovingtarget(slowMovingTarget);
369
                rbmTargets.setOtherTarget(otherTarget);
369
                rbmTargets.setOtherTarget(otherTarget);
370
                rbmTargets.setCreateTimestamp(LocalDateTime.now());
370
                rbmTargets.setCreateTimestamp(LocalDateTime.now());
371
 
371
 
372
                rbmTargetsRepository.persist(rbmTargets);
372
                rbmTargetsRepository.persist(rbmTargets);
373
 
373
 
Line 391... Line 391...
391
            rbmAchievements.setRbmAuthId(achievement.getAuthId());
391
            rbmAchievements.setRbmAuthId(achievement.getAuthId());
392
            rbmAchievements.setRbmName(achievement.getRbmName());
392
            rbmAchievements.setRbmName(achievement.getRbmName());
393
            rbmAchievements.setWarehouseId(achievement.getWarehouseId());
393
            rbmAchievements.setWarehouseId(achievement.getWarehouseId());
394
            rbmAchievements.setAchievedHidTarget(achievement.getHidBilled());
394
            rbmAchievements.setAchievedHidTarget(achievement.getHidBilled());
395
            rbmAchievements.setAchievedFastMovingTarget(achievement.getFastMovingBilled());
395
            rbmAchievements.setAchievedFastMovingTarget(achievement.getFastMovingBilled());
396
            rbmAchievements.setAchievedSlowMovingTarget(achievement.getSlowMovingBilled());
396
            rbmAchievements.setAchievedSlowMovingTarget(achievement.getSlowMovinBilled());
397
            rbmAchievements.setAchievedEolTarget(achievement.getEolBilled());
397
            rbmAchievements.setAchievedRunningTarget(achievement.getRunningBilled());
398
            rbmAchievements.setAchievedOtherTarget(achievement.getOtherBilled());
398
            rbmAchievements.setAchievedOtherTarget(achievement.getOtherBilled());
399
            rbmAchievements.setCreateTimestamp(LocalDateTime.now());
399
            rbmAchievements.setCreateTimestamp(LocalDateTime.now());
400
 
400
 
401
            rbmAchievementsRepository.persist(rbmAchievements);
401
            rbmAchievementsRepository.persist(rbmAchievements);
402
 
402