Subversion Repositories SmartDukaan

Rev

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

Rev 34002 Rev 34006
Line 154... Line 154...
154 
                    model.setAuthId(rbmAuthId);
 154 
                    model.setAuthId(rbmAuthId);
155 
                    model.setRbmName(target.getRbmName());
 155 
                    model.setRbmName(target.getRbmName());
156 
                    model.setWarehouseName(ProfitMandiConstants.WAREHOUSE_MAP.getOrDefault(warehouseId, "Unknown"));
 156 
                    model.setWarehouseName(ProfitMandiConstants.WAREHOUSE_MAP.getOrDefault(warehouseId, "Unknown"));
157 
 
 157 
 
158 
                    // Set target values
 158 
                    // Set target values
159 
                    model.setHidTarget(target.getHidTarget().longValue());
 159 
                    model.setHidTarget((long) target.getHidTarget());
160 
                    model.setEolTarget(target.getEolTarget().longValue());
 160 
                    model.setEolTarget((long) target.getEolTarget());
161 
                    model.setFastMovingTarget(target.getFastMovingTarget().longValue());
 161 
                    model.setFastMovingTarget((long) target.getFastMovingTarget());
162 
                    model.setSlowMovingTarget(target.getSlowMovingTarget().longValue());
 162 
                    model.setSlowMovingTarget((long) target.getSlowMovingTarget());
163 
                    model.setOtherMovingTarget(target.getOtherTarget().longValue());
 163 
                    model.setOtherMovingTarget((long) target.getOtherTarget());
164 
 
 164 
 
165 
                    // Set achievement values
 165 
                    // Set achievement values
166 
                    model.setAchievedHid(achievement.getAchievedHidTarget().longValue());
 166 
                    model.setAchievedHid((long) achievement.getAchievedHidTarget());
167 
                    model.setAchievedEol(achievement.getAchievedEolTarget().longValue());
 167 
                    model.setAchievedEol((long) achievement.getAchievedEolTarget());
168 
                    model.setAchievedFastMoving(achievement.getAchievedFastMovingTarget().longValue());
 168 
                    model.setAchievedFastMoving((long) achievement.getAchievedFastMovingTarget());
169 
                    model.setAchievedSlowMoving(achievement.getAchievedSlowMovingTarget().longValue());
 169 
                    model.setAchievedSlowMoving((long) achievement.getAchievedSlowMovingTarget());
170 
                    model.setAchievedOtherMoving(achievement.getAchievedOtherTarget().longValue());
 170 
                    model.setAchievedOtherMoving((long) achievement.getAchievedOtherTarget());
171 
 
 171 
 
172 
                    model.setTotalTarget(
 172 
                    model.setTotalTarget(
173 
                            target.getHidTarget().longValue() +
 173 
                            (long) target.getHidTarget() +
174 
                                    target.getEolTarget().longValue() +
 174 
                                    (long) target.getEolTarget() +
175 
                                    target.getFastMovingTarget().longValue() +
 175 
                                    (long) target.getFastMovingTarget() +
176 
                                    target.getSlowMovingTarget().longValue() +
 176 
                                    (long) target.getSlowMovingTarget() +
177 
                                    target.getOtherTarget().longValue()
 177 
                                    (long) target.getOtherTarget()
178 
                    );
 178 
                    );
179 
                    model.setTotalAchievemnt(
 179 
                    model.setTotalAchievemnt(
180 
                            achievement.getAchievedHidTarget().longValue() +
 180 
                            (long) achievement.getAchievedHidTarget() +
181 
                                    achievement.getAchievedEolTarget().longValue() +
 181 
                                    (long) achievement.getAchievedEolTarget() +
182 
                                    achievement.getAchievedFastMovingTarget().longValue() +
 182 
                                    (long) achievement.getAchievedFastMovingTarget() +
183 
                                    achievement.getAchievedSlowMovingTarget().longValue() +
 183 
                                    (long) achievement.getAchievedSlowMovingTarget() +
184 
                                    achievement.getAchievedOtherTarget().longValue()
 184 
                                    (long) achievement.getAchievedOtherTarget()
185 
                    );
 185 
                    );
186 
 
 186 
 
187 
                    return model;
 187 
                    return model;
188 
                })
 188 
                })
189 
                .collect(Collectors.toList());
 189 
                .collect(Collectors.toList());
Line 191... Line 191...
191 
    }
 191 
    }
192 
 
 192 
 
193 
    private RbmTargetsModel mergeTargets(RbmTargetsModel a1, RbmTargetsModel a2) {
 193 
    private RbmTargetsModel mergeTargets(RbmTargetsModel a1, RbmTargetsModel a2) {
194 
 
 194 
 
195 
        // Merge logic for achievements (aggregate the target and achieved values)
 195 
        // Merge logic for achievements (aggregate the target and achieved values)
196 
        a1.setHidTarget((a1.getHidTarget() != null ? a1.getHidTarget() : 0L) +
 196 
        a1.setHidTarget((a1.getHidTarget()) +
197 
                (a2.getHidTarget() != null ? a2.getHidTarget() : 0L));
 197 
                (a2.getHidTarget()));
198 
 
 198 
 
199 
        a1.setFastMovingTarget((a1.getFastMovingTarget() != null ? a1.getFastMovingTarget() : 0L) +
 199 
        a1.setFastMovingTarget((a1.getFastMovingTarget()) +
200 
                (a2.getFastMovingTarget() != null ? a2.getFastMovingTarget() : 0L));
 200 
                (a2.getFastMovingTarget()));
201 
 
 201 
 
202 
        a1.setSlowMovingTarget((a1.getSlowMovingTarget() != null ? a1.getSlowMovingTarget() : 0L) +
 202 
        a1.setSlowMovingTarget((a1.getSlowMovingTarget()) +
203 
                (a2.getSlowMovingTarget() != null ? a2.getSlowMovingTarget() : 0L));
 203 
                (a2.getSlowMovingTarget()));
204 
 
 204 
 
205 
        a1.setEolTarget((a1.getEolTarget() != null ? a1.getEolTarget() : 0L) +
 205 
        a1.setEolTarget((a1.getEolTarget()) +
206 
                (a2.getEolTarget() != null ? a2.getEolTarget() : 0L));
 206 
                (a2.getEolTarget()));
207 
 
 207 
 
208 
        a1.setOtherTarget((a1.getOtherTarget() != null ? a1.getOtherTarget() : 0L) +
 208 
        a1.setOtherTarget((a1.getOtherTarget()) +
209 
                (a2.getOtherTarget() != null ? a2.getOtherTarget() : 0L));
 209 
                (a2.getOtherTarget()));
210 
        return a1;
 210 
        return a1;
211 
    }
 211 
    }
212 
 
 212 
 
213 
    private RbmAchievementsModel mergeAchievements(RbmAchievementsModel a1, RbmAchievementsModel a2) {
 213 
    private RbmAchievementsModel mergeAchievements(RbmAchievementsModel a1, RbmAchievementsModel a2) {
214 
        // Merge logic for achievements (aggregate the target and achieved values)
 214 
        // Merge logic for achievements (aggregate the target and achieved values)
215 
        a1.setAchievedHidTarget((a1.getAchievedHidTarget() != null ? a1.getAchievedHidTarget() : 0L) +
 215 
        a1.setAchievedHidTarget((a1.getAchievedHidTarget()) +
216 
                (a2.getAchievedHidTarget() != null ? a2.getAchievedHidTarget() : 0L));
 216 
                (a2.getAchievedHidTarget()));
217 
 
 217 
 
218 
        a1.setAchievedEolTarget((a1.getAchievedEolTarget() != null ? a1.getAchievedEolTarget() : 0L) +
 218 
        a1.setAchievedEolTarget((a1.getAchievedEolTarget()) +
219 
                (a2.getAchievedEolTarget() != null ? a2.getAchievedEolTarget() : 0L));
 219 
                (a2.getAchievedEolTarget()));
220 
 
 220 
 
221 
        a1.setAchievedFastMovingTarget((a1.getAchievedFastMovingTarget() != null ? a1.getAchievedFastMovingTarget() : 0L) +
 221 
        a1.setAchievedFastMovingTarget((a1.getAchievedFastMovingTarget()) +
222 
                (a2.getAchievedFastMovingTarget() != null ? a2.getAchievedFastMovingTarget() : 0L));
 222 
                (a2.getAchievedFastMovingTarget()));
223 
 
 223 
 
224 
        a1.setAchievedSlowMovingTarget((a1.getAchievedSlowMovingTarget() != null ? a1.getAchievedSlowMovingTarget() : 0L) +
 224 
        a1.setAchievedSlowMovingTarget((a1.getAchievedSlowMovingTarget()) +
225 
                (a2.getAchievedSlowMovingTarget() != null ? a2.getAchievedSlowMovingTarget() : 0L));
 225 
                (a2.getAchievedSlowMovingTarget()));
226 
 
 226 
 
227 
        a1.setAchievedOtherTarget((a1.getAchievedOtherTarget() != null ? a1.getAchievedOtherTarget() : 0L) +
 227 
        a1.setAchievedOtherTarget((a1.getAchievedOtherTarget()) +
228 
                (a2.getAchievedOtherTarget() != null ? a2.getAchievedOtherTarget() : 0L));
 228 
                (a2.getAchievedOtherTarget()));
229 
 
 229 
 
230 
        return a1;
 230 
        return a1;
231 
    }
 231 
    }
232 
 
 232 
 
233 
    @Override
 233 
    @Override