Subversion Repositories SmartDukaan

Rev

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

Rev 30716 Rev 30717
Line 605... Line 605...
605
			}
605
			}
606
			fofoCatalogResponse.setBrand(doc.getJSONArray("brand_ss").getString(0));
606
			fofoCatalogResponse.setBrand(doc.getJSONArray("brand_ss").getString(0));
607
			if (doc.has("_childDocuments_")) {
607
			if (doc.has("_childDocuments_")) {
608
				String modelColorClass = "grey";
608
				String modelColorClass = "grey";
609
				FofoAvailabilityInfo fdiAnyColour = null;
609
				FofoAvailabilityInfo fdiAnyColour = null;
-
 
610
				//Iterating itemIds
610
				for (int j = 0; j < doc.getJSONArray("_childDocuments_").length(); j++) {
611
				for (int j = 0; j < doc.getJSONArray("_childDocuments_").length(); j++) {
611
					PriceCircularItemModel priceCircularItemModel = priceCircularItemModelMap
612
					PriceCircularItemModel priceCircularItemModel = priceCircularItemModelMap
612
							.get(fofoCatalogResponse.getCatalogId());
613
							.get(fofoCatalogResponse.getCatalogId());
613
					JSONObject childItem = doc.getJSONArray("_childDocuments_").getJSONObject(j);
614
					JSONObject childItem = doc.getJSONArray("_childDocuments_").getJSONObject(j);
614
					int itemId = childItem.getInt("itemId_i");
615
					int itemId = childItem.getInt("itemId_i");
615
					float sellingPrice = (float) childItem.getDouble("sellingPrice_f");
616
					float sellingPrice = (float) childItem.getDouble("sellingPrice_f");
616
					if (fofoAvailabilityInfoMap.containsKey(itemId)) {
617
					if (fofoAvailabilityInfoMap.containsKey(itemId)) {
617
						if (fofoAvailabilityInfoMap.get(itemId).getSellingPrice() > sellingPrice) {
618
						/*if (fofoAvailabilityInfoMap.get(itemId).getSellingPrice() > sellingPrice) {
618
							fofoAvailabilityInfoMap.get(itemId).setSellingPrice(sellingPrice);
619
							fofoAvailabilityInfoMap.get(itemId).setSellingPrice(sellingPrice);
619
							fofoAvailabilityInfoMap.get(itemId).setMop((float) childItem.getDouble("mop_f"));
620
							fofoAvailabilityInfoMap.get(itemId).setMop((float) childItem.getDouble("mop_f"));
620
							fofoAvailabilityInfoMap.get(itemId)
621
							fofoAvailabilityInfoMap.get(itemId)
621
									.setNlc(priceCircularItemModel == null ? 0 : priceCircularItemModel.getNetPrice());
622
									.setNlc(priceCircularItemModel == null ? 0 : priceCircularItemModel.getNetPrice());
622
						}
623
						}*/
623
					} else {
624
					} else {
624
						FofoAvailabilityInfo fdi = new FofoAvailabilityInfo();
625
						FofoAvailabilityInfo fdi = new FofoAvailabilityInfo();
625
						List<SaholicCISTable> currentAvailability = saholicCISTableRepository.selectByItemWarehouse(itemId, warehouseId);
626
						List<SaholicCISTable> currentAvailability = saholicCISTableRepository.selectByItemWarehouse(itemId, warehouseId);
626
						List<SaholicPOItem> poItemAvailability = null;
627
						List<SaholicPOItem> poItemAvailability = null;
627
						if (poItemAvailabilityMap != null) {
628
						if (poItemAvailabilityMap != null) {