| Line 683... |
Line 683... |
| 683 |
catalogListingModel.setStockInHand(0);
|
683 |
catalogListingModel.setStockInHand(0);
|
| 684 |
}
|
684 |
}
|
| 685 |
Integer inTransitQuantity = itemsInTransit.get(item.getId());
|
685 |
Integer inTransitQuantity = itemsInTransit.get(item.getId());
|
| 686 |
int inTransitQty = (inTransitQuantity == null ? 0 : inTransitQuantity);
|
686 |
int inTransitQty = (inTransitQuantity == null ? 0 : inTransitQuantity);
|
| 687 |
catalogListingModel.setInTransitQuantity(catalogListingModel.getInTransitQuantity() + inTransitQty);
|
687 |
catalogListingModel.setInTransitQuantity(catalogListingModel.getInTransitQuantity() + inTransitQty);
|
| - |
|
688 |
if (!plannedDetailMap.isEmpty()) {
|
| - |
|
689 |
if (plannedDetailMap.get(catalogId) != null) {
|
| 688 |
|
690 |
|
| 689 |
if (plannedDetailMap.get(catalogId) != null) {
|
691 |
int remaining = plannedDetailMap.get(catalogId) - catalogListingModel.getLast15DaysSale()
|
| - |
|
692 |
+ catalogListingModel.getStockInHand() + catalogListingModel.getInTransitQuantity();
|
| - |
|
693 |
LOGGER.info("remaning" + remaining);
|
| 690 |
|
694 |
|
| 691 |
int remaining = plannedDetailMap.get(catalogId) - catalogListingModel.getLast15DaysSale()
|
- |
|
| 692 |
+ catalogListingModel.getStockInHand() + catalogListingModel.getInTransitQuantity();
|
- |
|
| 693 |
LOGGER.info("remaning" + remaining);
|
- |
|
| 694 |
|
- |
|
| 695 |
if (remaining != 0) {
|
695 |
if (remaining != 0) {
|
| 696 |
catalogListingModel.setRemaining(remaining);
|
696 |
catalogListingModel.setRemaining(remaining);
|
| 697 |
} else {
|
697 |
} else {
|
| 698 |
catalogListingModel.setRemaining(0);
|
698 |
catalogListingModel.setRemaining(0);
|
| - |
|
699 |
}
|
| 699 |
}
|
700 |
}
|
| 700 |
}
|
701 |
}
|
| 701 |
}
|
702 |
}
|
| 702 |
|
703 |
|
| 703 |
Map<Integer, CustomRetailer> customRetailersMap = retailerService.getFofoRetailers();
|
704 |
Map<Integer, CustomRetailer> customRetailersMap = retailerService.getFofoRetailers();
|
| Line 719... |
Line 720... |
| 719 |
Comparator.reverseOrder());
|
720 |
Comparator.reverseOrder());
|
| 720 |
LOGGER.info("monthlyPlanned" + monthlyPlanned);
|
721 |
LOGGER.info("monthlyPlanned" + monthlyPlanned);
|
| 721 |
model.addAttribute("catalogTagListings",
|
722 |
model.addAttribute("catalogTagListings",
|
| 722 |
catalogModelList.stream().sorted(firstCmp).collect(Collectors.toList()));
|
723 |
catalogModelList.stream().sorted(firstCmp).collect(Collectors.toList()));
|
| 723 |
model.addAttribute("isAdmin", roleManager.isAdmin(roleIds));
|
724 |
model.addAttribute("isAdmin", roleManager.isAdmin(roleIds));
|
| 724 |
model.addAttribute("brandStockPrices",this.getBrandStockPrices(loginDetails.getFofoId()));
|
725 |
model.addAttribute("brandStockPrices", this.getBrandStockPrices(loginDetails.getFofoId()));
|
| 725 |
model.addAttribute("previousPlanningMonth", LocalDate.now().minusMonths(1).getMonth());
|
726 |
model.addAttribute("previousPlanningMonth", LocalDate.now().minusMonths(1).getMonth());
|
| 726 |
model.addAttribute("currentPlanningMonth", LocalDate.now().getMonth());
|
727 |
model.addAttribute("currentPlanningMonth", LocalDate.now().getMonth());
|
| 727 |
|
728 |
|
| 728 |
model.addAttribute("customRetailers", customRetailers);
|
729 |
model.addAttribute("customRetailers", customRetailers);
|
| 729 |
model.addAttribute("totalAmount", totalAmount);
|
730 |
model.addAttribute("totalAmount", totalAmount);
|
| Line 938... |
Line 939... |
| 938 |
model.addAttribute("catalogTagListings",
|
939 |
model.addAttribute("catalogTagListings",
|
| 939 |
catalogModelList.stream().sorted(firstCmp).collect(Collectors.toList()));
|
940 |
catalogModelList.stream().sorted(firstCmp).collect(Collectors.toList()));
|
| 940 |
model.addAttribute("isAdmin", roleManager.isAdmin(roleIds));
|
941 |
model.addAttribute("isAdmin", roleManager.isAdmin(roleIds));
|
| 941 |
model.addAttribute("previousMonth", true);
|
942 |
model.addAttribute("previousMonth", true);
|
| 942 |
model.addAttribute("freezed", true);
|
943 |
model.addAttribute("freezed", true);
|
| 943 |
model.addAttribute("brandStockPrices",this.getBrandStockPrices(loginDetails.getFofoId()));
|
944 |
model.addAttribute("brandStockPrices", this.getBrandStockPrices(loginDetails.getFofoId()));
|
| 944 |
model.addAttribute("customRetailers", customRetailers);
|
945 |
model.addAttribute("customRetailers", customRetailers);
|
| 945 |
model.addAttribute("totalAmount", totalAmount);
|
946 |
model.addAttribute("totalAmount", totalAmount);
|
| 946 |
model.addAttribute("monthlyPlanned", monthlyPlanned);
|
947 |
model.addAttribute("monthlyPlanned", monthlyPlanned);
|
| 947 |
model.addAttribute("totalPcs", totalPcs);
|
948 |
model.addAttribute("totalPcs", totalPcs);
|
| 948 |
return "open-indent";
|
949 |
return "open-indent";
|