Subversion Repositories SmartDukaan

Rev

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

Rev 30717 Rev 31324
Line 612... Line 612...
612
					PriceCircularItemModel priceCircularItemModel = priceCircularItemModelMap
612
					PriceCircularItemModel priceCircularItemModel = priceCircularItemModelMap
613
							.get(fofoCatalogResponse.getCatalogId());
613
							.get(fofoCatalogResponse.getCatalogId());
614
					JSONObject childItem = doc.getJSONArray("_childDocuments_").getJSONObject(j);
614
					JSONObject childItem = doc.getJSONArray("_childDocuments_").getJSONObject(j);
615
					int itemId = childItem.getInt("itemId_i");
615
					int itemId = childItem.getInt("itemId_i");
616
					float sellingPrice = (float) childItem.getDouble("sellingPrice_f");
616
					float sellingPrice = (float) childItem.getDouble("sellingPrice_f");
617
					if (fofoAvailabilityInfoMap.containsKey(itemId)) {
617
					if (!fofoAvailabilityInfoMap.containsKey(itemId))  {
618
						/*if (fofoAvailabilityInfoMap.get(itemId).getSellingPrice() > sellingPrice) {
-
 
619
							fofoAvailabilityInfoMap.get(itemId).setSellingPrice(sellingPrice);
-
 
620
							fofoAvailabilityInfoMap.get(itemId).setMop((float) childItem.getDouble("mop_f"));
-
 
621
							fofoAvailabilityInfoMap.get(itemId)
-
 
622
									.setNlc(priceCircularItemModel == null ? 0 : priceCircularItemModel.getNetPrice());
-
 
623
						}*/
-
 
624
					} else {
-
 
625
						FofoAvailabilityInfo fdi = new FofoAvailabilityInfo();
618
						FofoAvailabilityInfo fdi = new FofoAvailabilityInfo();
626
						List<SaholicCISTable> currentAvailability = saholicCISTableRepository.selectByItemWarehouse(itemId, warehouseId);
619
						List<SaholicCISTable> currentAvailability = saholicCISTableRepository.selectByItemWarehouse(itemId, warehouseId);
627
						List<SaholicPOItem> poItemAvailability = null;
620
						List<SaholicPOItem> poItemAvailability = null;
628
						if (poItemAvailabilityMap != null) {
621
						if (poItemAvailabilityMap != null) {
629
							poItemAvailability = poItemAvailabilityMap.get(itemId);
622
							poItemAvailability = poItemAvailabilityMap.get(itemId);
Line 636... Line 629...
636
						}
629
						}
637
 
630
 
638
						Map<Integer, SaholicCISTable> map = currentAvailability.stream()
631
						Map<Integer, SaholicCISTable> map = currentAvailability.stream()
639
								.collect(Collectors.toMap(SaholicCISTable::getWarehouseFrom, x -> x));
632
								.collect(Collectors.toMap(SaholicCISTable::getWarehouseFrom, x -> x));
640
						if (poItemAvailability != null) {
633
						if (poItemAvailability != null) {
641
 
-
 
642
							if (fofoCatalogResponse.getCatalogId() == 1023522) {
-
 
643
								logger.info("currentAvailabilityMap --> {}", map);
-
 
644
								logger.info("currentAvailability --> {}", currentAvailability);
-
 
645
								logger.info("currentAvailabilitySum --> {}", currentAvailability.stream()
-
 
646
										.collect(Collectors.summingInt(SaholicCISTable::getNetAvailability)));
-
 
647
							}
-
 
648
 
-
 
649
							for (SaholicPOItem saholicPOItem : poItemAvailability) {
634
							for (SaholicPOItem saholicPOItem : poItemAvailability) {
650
								if (fofoCatalogResponse.getCatalogId() == 1023522) {
-
 
651
									logger.info("SaholicPoItem {}", saholicPOItem);
-
 
652
									logger.info("Warehouse From - {}", map.get(saholicPOItem.getWarehouseFrom()));
-
 
653
								}
-
 
654
								if (map.containsKey(saholicPOItem.getWarehouseFrom())) {
635
								if (map.containsKey(saholicPOItem.getWarehouseFrom())) {
655
									map.get(saholicPOItem.getWarehouseFrom())
636
									map.get(saholicPOItem.getWarehouseFrom())
656
											.setPopendingQty(saholicPOItem.getUnfulfilledQty());
637
											.setPopendingQty(saholicPOItem.getUnfulfilledQty());
657
								} else {
638
								} else {
658
									SaholicCISTable saholicCISTable = new SaholicCISTable();
639
									SaholicCISTable saholicCISTable = new SaholicCISTable();