| Line 1062... |
Line 1062... |
| 1062 |
modelTotalIncomeMap.put(x.getCatalogItemId(), x.getAmount());
|
1062 |
modelTotalIncomeMap.put(x.getCatalogItemId(), x.getAmount());
|
| 1063 |
modelNameMap.put(x.getCatalogItemId(), (x.getModelNumber() + x.getModelName()).trim());
|
1063 |
modelNameMap.put(x.getCatalogItemId(), (x.getModelNumber() + x.getModelName()).trim());
|
| 1064 |
|
1064 |
|
| 1065 |
});
|
1065 |
});
|
| 1066 |
modelWiseSalesMargins.stream().forEach(x -> {
|
1066 |
modelWiseSalesMargins.stream().forEach(x -> {
|
| 1067 |
if (!modelTotalIncomeMap.containsKey(x.getCatalogItemId())) {
|
1067 |
if (!modelWiseSchemeOutMarginsMap.containsKey(x.getCatalogItemId())) {
|
| 1068 |
modelTotalIncomeMap.put(x.getCatalogItemId(), 0d);
|
1068 |
modelTotalIncomeMap.put(x.getCatalogItemId(), 0d);
|
| 1069 |
LastMonthBrandWiseIncomeModel lmbwIncomeModel = new LastMonthBrandWiseIncomeModel();
|
1069 |
LastMonthBrandWiseIncomeModel lmbwIncomeModel = new LastMonthBrandWiseIncomeModel();
|
| 1070 |
lmbwIncomeModel.setAmount(x.getAmount());
|
1070 |
lmbwIncomeModel.setAmount(x.getAmount());
|
| 1071 |
lmbwIncomeModel.setModelName(x.getModelName());
|
1071 |
lmbwIncomeModel.setModelName(x.getModelName());
|
| 1072 |
lmbwIncomeModel.setModelNumber(x.getModelNumber());
|
1072 |
lmbwIncomeModel.setModelNumber(x.getModelNumber());
|
| Line 1079... |
Line 1079... |
| 1079 |
|
1079 |
|
| 1080 |
}
|
1080 |
}
|
| 1081 |
LastMonthBrandWiseIncomeModel lmbwIncomeModel = modelWiseSchemeOutMarginsMap.get(x.getCatalogItemId());
|
1081 |
LastMonthBrandWiseIncomeModel lmbwIncomeModel = modelWiseSchemeOutMarginsMap.get(x.getCatalogItemId());
|
| 1082 |
lmbwIncomeModel.setQty(x.getQty());
|
1082 |
lmbwIncomeModel.setQty(x.getQty());
|
| 1083 |
lmbwIncomeModel.setAmount(lmbwIncomeModel.getAmount() + x.getAmount());
|
1083 |
lmbwIncomeModel.setAmount(lmbwIncomeModel.getAmount() + x.getAmount());
|
| 1084 |
modelTotalIncomeMap.put(x.getCatalogItemId(), modelTotalIncomeMap.get(x.getCatalogItemId()) + x.getAmount());
|
1084 |
modelTotalIncomeMap.put(x.getCatalogItemId(), modelTotalIncomeMap.get(x.getCatalogItemId()) + x.getAmount() + x.getPendingSaleAmount());
|
| 1085 |
modelNameMap.put(x.getCatalogItemId(), (x.getModelNumber() + x.getModelName()).trim());
|
1085 |
modelNameMap.put(x.getCatalogItemId(), (x.getModelNumber() + x.getModelName()).trim());
|
| 1086 |
|
1086 |
|
| 1087 |
});
|
1087 |
});
|
| 1088 |
modelWiseSchemeInMargins.stream().forEach(x -> {
|
1088 |
modelWiseSchemeInMargins.stream().forEach(x -> {
|
| 1089 |
if (!modelTotalIncomeMap.containsKey(x.getCatalogItemId())) {
|
1089 |
if (!modelTotalIncomeMap.containsKey(x.getCatalogItemId())) {
|
| 1090 |
modelTotalIncomeMap.put(x.getCatalogItemId(), 0d);
|
1090 |
modelTotalIncomeMap.put(x.getCatalogItemId(), 0d);
|
| 1091 |
}
|
1091 |
}
|
| 1092 |
modelTotalIncomeMap.put(x.getCatalogItemId(), modelTotalIncomeMap.get(x.getCatalogItemId()) + x.getAmount() + x.getPendingSaleAmount());
|
1092 |
modelTotalIncomeMap.put(x.getCatalogItemId(), modelTotalIncomeMap.get(x.getCatalogItemId()) + x.getAmount());
|
| 1093 |
modelNameMap.put(x.getCatalogItemId(), (x.getModelNumber() + x.getModelName()).trim());
|
1093 |
modelNameMap.put(x.getCatalogItemId(), (x.getModelNumber() + x.getModelName()).trim());
|
| 1094 |
|
1094 |
|
| 1095 |
});
|
1095 |
});
|
| 1096 |
|
1096 |
|
| 1097 |
model.addAttribute("month", month);
|
1097 |
model.addAttribute("month", month);
|