Subversion Repositories SmartDukaan

Rev

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

Rev 31286 Rev 31334
Line 1150... Line 1150...
1150
				LastMonthBrandWiseIncomeModel lmbwIncomeModel = new LastMonthBrandWiseIncomeModel();
1150
				LastMonthBrandWiseIncomeModel lmbwIncomeModel = new LastMonthBrandWiseIncomeModel();
1151
				lmbwIncomeModel.setModelName(x.getModelName());
1151
				lmbwIncomeModel.setModelName(x.getModelName());
1152
				lmbwIncomeModel.setModelNumber(x.getModelNumber());
1152
				lmbwIncomeModel.setModelNumber(x.getModelNumber());
1153
				lmbwIncomeModel.setBrand(x.getBrand());
1153
				lmbwIncomeModel.setBrand(x.getBrand());
1154
				lmbwIncomeModel.setCatalogItemId(x.getCatalogItemId());
1154
				lmbwIncomeModel.setCatalogItemId(x.getCatalogItemId());
-
 
1155
				lmbwIncomeModel.setQty(x.getQty());
1155
				modelWiseSchemeOutMarginsMap.put(x.getCatalogItemId(), lmbwIncomeModel);
1156
				modelWiseSchemeOutMarginsMap.put(x.getCatalogItemId(), lmbwIncomeModel);
-
 
1157
				totalModel.setQty(totalModel.getQty() + x.getQty());
1156
			}
1158
			}
1157
			LastMonthBrandWiseIncomeModel lmbwIncomeModel = modelWiseSchemeOutMarginsMap.get(x.getCatalogItemId());
1159
			LastMonthBrandWiseIncomeModel lmbwIncomeModel = modelWiseSchemeOutMarginsMap.get(x.getCatalogItemId());
1158
			lmbwIncomeModel.setQty(lmbwIncomeModel.getQty() + x.getQty());
-
 
-
 
1160
 
1159
			lmbwIncomeModel.setAmount(lmbwIncomeModel.getAmount() + x.getAmount());
1161
			lmbwIncomeModel.setAmount(lmbwIncomeModel.getAmount() + x.getAmount());
1160
			modelTotalIncomeMap.put(x.getCatalogItemId(),
1162
			modelTotalIncomeMap.put(x.getCatalogItemId(),
1161
					modelTotalIncomeMap.get(x.getCatalogItemId()) == null ? x.getAmount() : x.getAmount() + modelTotalIncomeMap.get(x.getCatalogItemId()));
1163
					modelTotalIncomeMap.get(x.getCatalogItemId()) == null ? x.getAmount() : x.getAmount() + modelTotalIncomeMap.get(x.getCatalogItemId()));
1162
			modelNameMap.put(x.getCatalogItemId(), (x.getModelNumber() + x.getModelName()).trim());
1164
			modelNameMap.put(x.getCatalogItemId(), (x.getModelNumber() + x.getModelName()).trim());
1163
			totalModel.setQty(totalModel.getQty() + x.getQty());
-
 
1164
			totalModel.setAmount(totalModel.getAmount() + lmbwIncomeModel.getAmount());
1165
			totalModel.setAmount(totalModel.getAmount() + lmbwIncomeModel.getAmount());
1165
			totalModel.setPendingSaleAmount(totalModel.getPendingSaleAmount());
1166
			totalModel.setPendingSaleAmount(totalModel.getPendingSaleAmount());
1166
 
1167
 
1167
		});
1168
		});
1168
		modelWiseSchemeInMargins.stream().forEach(x -> {
1169
		modelWiseSchemeInMargins.stream().forEach(x -> {