Subversion Repositories SmartDukaan

Rev

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

Rev 30692 Rev 30693
Line 627... Line 627...
627
						if (poItemAvailabilityMap != null) {
627
						if (poItemAvailabilityMap != null) {
628
							poItemAvailability = poItemAvailabilityMap.get(itemId);
628
							poItemAvailability = poItemAvailabilityMap.get(itemId);
629
						}
629
						}
630
						fdi.setNlc(priceCircularItemModel == null ? 0 : priceCircularItemModel.getNetPrice());
630
						fdi.setNlc(priceCircularItemModel == null ? 0 : priceCircularItemModel.getNetPrice());
631
 
631
 
632
						Map<Integer, SaholicCISTable> map = null;
-
 
633
						for (SaholicCISTable saholicCISTable : currentAvailability) {
632
						for (SaholicCISTable saholicCISTable : currentAvailability) {
634
							saholicCISTable.setWarehouseName(
633
							saholicCISTable.setWarehouseName(
635
									ProfitMandiConstants.WAREHOUSE_MAP.get(saholicCISTable.getWarehouseFrom()));
634
									ProfitMandiConstants.WAREHOUSE_MAP.get(saholicCISTable.getWarehouseFrom()));
636
						}
635
						}
-
 
636
 
637
						map = currentAvailability.stream()
637
						Map<Integer, SaholicCISTable> map = currentAvailability.stream()
638
								.collect(Collectors.toMap(SaholicCISTable::getWarehouseFrom, x -> x));
638
								.collect(Collectors.toMap(SaholicCISTable::getWarehouseFrom, x -> x));
639
						if (poItemAvailability != null) {
639
						if (poItemAvailability != null) {
640
							for (SaholicPOItem saholicPOItem : poItemAvailability) {
640
							for (SaholicPOItem saholicPOItem : poItemAvailability) {
641
								if (map.containsKey(saholicPOItem.getWarehouseFrom())) {
641
								if (map.containsKey(saholicPOItem.getWarehouseFrom())) {
642
									map.get(saholicPOItem.getWarehouseFrom())
642
									map.get(saholicPOItem.getWarehouseFrom())
Line 656... Line 656...
656
							}
656
							}
657
						}
657
						}
658
						fdi.setSaholicCISTableList(new ArrayList<>(map.values()));
658
						fdi.setSaholicCISTableList(new ArrayList<>(map.values()));
659
						String poColor = "grey";
659
						String poColor = "grey";
660
						boolean active = false;
660
						boolean active = false;
661
						if (fofoCatalogResponse.getCatalogId() == 1023216) {
661
						/*if (fofoCatalogResponse.getCatalogId() == 1023216) {
662
							logger.info("currentAvailabilityMap --> {}", map);
662
							logger.info("currentAvailabilityMap --> {}", map);
663
							logger.info("currentAvailability --> {}", currentAvailability);
663
							logger.info("currentAvailability --> {}", currentAvailability);
664
							logger.info("currentAvailabilitySum --> {}", currentAvailability.stream()
664
							logger.info("currentAvailabilitySum --> {}", currentAvailability.stream()
665
									.collect(Collectors.summingInt(SaholicCISTable::getNetAvailability)));
665
									.collect(Collectors.summingInt(SaholicCISTable::getNetAvailability)));
666
						}
666
						}*/
667
						if (currentAvailability != null && currentAvailability.stream()
667
						if (currentAvailability != null && currentAvailability.stream()
668
								.collect(Collectors.summingInt(SaholicCISTable::getNetAvailability)) > 0) {
668
								.collect(Collectors.summingInt(SaholicCISTable::getNetAvailability)) > 0) {
669
							poColor = "green";
669
							poColor = "green";
670
							modelColorClass = "green";
670
							modelColorClass = "green";
671
						} else if (poItemAvailability != null && poItemAvailability.stream()
671
						} else if (poItemAvailability != null && poItemAvailability.stream()