Subversion Repositories SmartDukaan

Rev

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

Rev 22581 Rev 22860
Line 45... Line 45...
45
import com.spice.profitmandi.common.util.StringUtils;
45
import com.spice.profitmandi.common.util.StringUtils;
46
import com.spice.profitmandi.common.util.Utils;
46
import com.spice.profitmandi.common.util.Utils;
47
import com.spice.profitmandi.common.web.util.ResponseSender;
47
import com.spice.profitmandi.common.web.util.ResponseSender;
48
import com.spice.profitmandi.dao.entity.catalog.Item;
48
import com.spice.profitmandi.dao.entity.catalog.Item;
49
import com.spice.profitmandi.dao.entity.fofo.CurrentInventorySnapshot;
49
import com.spice.profitmandi.dao.entity.fofo.CurrentInventorySnapshot;
50
import com.spice.profitmandi.dao.entity.fofo.FofoItemId;
-
 
51
import com.spice.profitmandi.dao.entity.fofo.InventoryItem;
50
import com.spice.profitmandi.dao.entity.fofo.InventoryItem;
52
import com.spice.profitmandi.dao.entity.fofo.Purchase;
51
import com.spice.profitmandi.dao.entity.fofo.Purchase;
53
import com.spice.profitmandi.dao.entity.transaction.LineItem;
52
import com.spice.profitmandi.dao.entity.transaction.LineItem;
54
import com.spice.profitmandi.dao.entity.transaction.Order;
53
import com.spice.profitmandi.dao.entity.transaction.Order;
55
import com.spice.profitmandi.dao.repository.catalog.ItemRepository;
54
import com.spice.profitmandi.dao.repository.catalog.ItemRepository;
Line 171... Line 170...
171
		}
170
		}
172
		List<CurrentInventorySnapshot> currentInventorySnapshots = currentInventorySnapshotRepository.getCurrentInventorySnapshot(fofoDetails.getFofoId(), offset, limit, searchTerm);
171
		List<CurrentInventorySnapshot> currentInventorySnapshots = currentInventorySnapshotRepository.getCurrentInventorySnapshot(fofoDetails.getFofoId(), offset, limit, searchTerm);
173
		long countItems = currentInventorySnapshotRepository.getCurrentInventorySnapshotCount(fofoDetails.getFofoId(), searchTerm);
172
		long countItems = currentInventorySnapshotRepository.getCurrentInventorySnapshotCount(fofoDetails.getFofoId(), searchTerm);
174
		Set<Integer> itemIds = new HashSet<>();
173
		Set<Integer> itemIds = new HashSet<>();
175
		for(CurrentInventorySnapshot currentInventorySnapshot : currentInventorySnapshots ){
174
		for(CurrentInventorySnapshot currentInventorySnapshot : currentInventorySnapshots ){
176
			itemIds.add(currentInventorySnapshot.getId().getItemId());
175
			itemIds.add(currentInventorySnapshot.getItemId());
177
		}
176
		}
178
		Map<Integer, PriceModel> mopPriceMap = pricingService.getPurchasePriceMopPriceNotFound(itemIds, fofoDetails.getFofoId());
177
		Map<Integer, PriceModel> mopPriceMap = pricingService.getPurchasePriceMopPriceNotFound(itemIds, fofoDetails.getFofoId());
179
		List<InventoryItem> inventoryItems = inventoryItemRepository.selectByFofoIdItemIds(fofoDetails.getFofoId(), itemIds);
178
		List<InventoryItem> inventoryItems = inventoryItemRepository.selectByFofoIdItemIds(fofoDetails.getFofoId(), itemIds);
180
		Map<Integer, Set<String>> itemIdSerialNumbers = new HashMap<>();
179
		Map<Integer, Set<String>> itemIdSerialNumbers = new HashMap<>();
181
		for(InventoryItem inventoryItem : inventoryItems){
180
		for(InventoryItem inventoryItem : inventoryItems){
Line 216... Line 215...
216
			return "response";
215
			return "response";
217
		}
216
		}
218
		List<CurrentInventorySnapshot> currentInventorySnapshots = currentInventorySnapshotRepository.getCurrentInventorySnapshot(fofoDetails.getFofoId(), offset, limit, searchTerm);
217
		List<CurrentInventorySnapshot> currentInventorySnapshots = currentInventorySnapshotRepository.getCurrentInventorySnapshot(fofoDetails.getFofoId(), offset, limit, searchTerm);
219
		Set<Integer> itemIds = new HashSet<>();
218
		Set<Integer> itemIds = new HashSet<>();
220
		for(CurrentInventorySnapshot currentInventorySnapshot : currentInventorySnapshots ){
219
		for(CurrentInventorySnapshot currentInventorySnapshot : currentInventorySnapshots ){
221
			itemIds.add(currentInventorySnapshot.getId().getItemId());
220
			itemIds.add(currentInventorySnapshot.getItemId());
222
		}
221
		}
223
		Map<Integer, PriceModel> mopPriceMap = pricingService.getPurchasePriceMopPriceNotFound(itemIds, fofoDetails.getFofoId());
222
		Map<Integer, PriceModel> mopPriceMap = pricingService.getPurchasePriceMopPriceNotFound(itemIds, fofoDetails.getFofoId());
224
		model.addAttribute("currentInventorySnapshot",currentInventorySnapshots);
223
		model.addAttribute("currentInventorySnapshot",currentInventorySnapshots);
225
		model.addAttribute("mopPriceMap", mopPriceMap);
224
		model.addAttribute("mopPriceMap", mopPriceMap);
226
		return "catalog-paginated";
225
		return "catalog-paginated";
Line 253... Line 252...
253
		} catch (ProfitMandiBusinessException e) {
252
		} catch (ProfitMandiBusinessException e) {
254
			model.addAttribute("loginResponse", mvcResponseSender.createResponseString("RTLR_1009", false, "/login"));
253
			model.addAttribute("loginResponse", mvcResponseSender.createResponseString("RTLR_1009", false, "/login"));
255
			return "response";
254
			return "response";
256
		}
255
		}
257
		try{
256
		try{
258
			FofoItemId fofoItemId = new FofoItemId();
-
 
259
			fofoItemId.setFofoId(fofoDetails.getFofoId());
-
 
260
			fofoItemId.setItemId(itemId);
-
 
261
			Object[] row = currentInventorySnapshotRepository.selectCustomByFofoItemId(fofoItemId);
257
			Object[] row = currentInventorySnapshotRepository.selectCustomByItemIdAndFofoId(itemId, fofoDetails.getFofoId());
262
			model.addAttribute("currentInventorySnapshot", new Gson().toJson(this.createCustomCurrentInventorySnapshop(row)));
258
			model.addAttribute("currentInventorySnapshot", new Gson().toJson(this.createCustomCurrentInventorySnapshop(row)));
263
			return "current-item-availability";
259
			return "current-item-availability";
264
		}catch(ProfitMandiBusinessException profitMandiBusinessException){
260
		}catch(ProfitMandiBusinessException profitMandiBusinessException){
265
			model.addAttribute("loginResponse", mvcResponseSender.createResponseString("INVNTRY_SNPSHT", false, "/dashboard"));
261
			model.addAttribute("loginResponse", mvcResponseSender.createResponseString("INVNTRY_SNPSHT", false, "/dashboard"));
266
			return "response";
262
			return "response";
Line 616... Line 612...
616
		this.createGrnHistoryDetails(grnHistoryDetails, inventoryItems);
612
		this.createGrnHistoryDetails(grnHistoryDetails, inventoryItems);
617
		Map<Integer, Map<String, Object>> completedItemDetails = this.toMap(inventoryItemDetails, purchase);
613
		Map<Integer, Map<String, Object>> completedItemDetails = this.toMap(inventoryItemDetails, purchase);
618
 
614
 
619
		this.writeItemDetailstoGrnHistories(grnHistoryDetails, completedItemDetails);
615
		this.writeItemDetailstoGrnHistories(grnHistoryDetails, completedItemDetails);
620
 
616
 
621
		if(!purchase.isCompleted()){
617
		if(purchase.getCompleteTimestamp() != null){
622
			List<Order> orders = orderRepository.selectByInvoiceNumberRetailerIdNotItemIds(purchase.getPurchaseReference(), fofoId, itemIds);
618
			List<Order> orders = orderRepository.selectByInvoiceNumberRetailerIdNotItemIds(purchase.getPurchaseReference(), fofoId, itemIds);
623
			for(Order order : orders){
619
			for(Order order : orders){
624
				LineItem lineItem = order.getLineItem();
620
				LineItem lineItem = order.getLineItem();
625
				//orderItemDetails.add(lineItem.getItem());
621
				//orderItemDetails.add(lineItem.getItem());
626
				Item item = lineItem.getItem();
622
				Item item = lineItem.getItem();