Subversion Repositories SmartDukaan

Rev

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

Rev 9428 Rev 9429
Line 11... Line 11...
11 
import in.shop2020.utils.ModelUtils;
 11 
import in.shop2020.utils.ModelUtils;
12 
import in.shop2020.warehouse.InventoryItem;
 12 
import in.shop2020.warehouse.InventoryItem;
13 
import in.shop2020.warehouse.ScanType;
 13 
import in.shop2020.warehouse.ScanType;
14 
import in.shop2020.warehouse.WarehouseService.Client;
 14 
import in.shop2020.warehouse.WarehouseService.Client;
15 
 
 15 
 
- 
 
 16 
import java.util.ArrayList;
16 
import java.util.List;
 17 
import java.util.List;
17 
 
 18 
 
18 
import org.apache.commons.logging.Log;
 19 
import org.apache.commons.logging.Log;
19 
import org.apache.commons.logging.LogFactory;
 20 
import org.apache.commons.logging.LogFactory;
20 
 
 21 
 
Line 27... Line 28...
27 
    private String id;
 28 
    private String id;
28 
    List<InventoryItem> inventoryItems;
 29 
    List<InventoryItem> inventoryItems;
29 
 
 30 
 
30 
    public String index() {
 31 
    public String index() {
31 
        try {
 32 
        try {
- 
 
 33 
        	List<InventoryItem> tobeRemovedInventoryItems = new ArrayList<InventoryItem>();
32 
            Client warehouseClient = new WarehouseClient().getClient();
 34 
            Client warehouseClient = new WarehouseClient().getClient();
33 
            inventoryItems = warehouseClient
 35 
            inventoryItems = warehouseClient
34 
                    .getInventoryItemsFromLastScanType(ScanType.DOA_OUT);
 36 
                    .getInventoryItemsFromLastScanType(ScanType.DOA_OUT);
35 
            for(InventoryItem inventoryItem:inventoryItems) {
 37 
            for(InventoryItem inventoryItem:inventoryItems) {
36 
            	if(inventoryItem.getId()<59078 ||
38 
            	if(inventoryItem.getId()<59078 ||
37 
            			inventoryItem.getCurrentWarehouseId() == 1 ||
39 
            			inventoryItem.getCurrentWarehouseId() == 1 ||
38 
            			inventoryItem.getCurrentWarehouseId() == 9) {//removing doa_in entries before 2013 and all hotspot entries
40 
            			inventoryItem.getCurrentWarehouseId() == 9) {//removing doa_in entries before 2013 and all hotspot entries
39 
            		inventoryItems.remove(inventoryItem);
 41 
            		tobeRemovedInventoryItems.add(inventoryItem);
40 
            	}
 42 
            	}
41 
            }
 43 
            }
- 
 
 44 
            for(InventoryItem inventoryItem:tobeRemovedInventoryItems) {
- 
 
 45 
            	inventoryItems.remove(inventoryItem);
- 
 
 46 
            }
42 
        } catch (Exception e) {
 47 
        } catch (Exception e) {
43 
            logger.error("Could not fetch inventory items", e);
 48 
            logger.error("Could not fetch inventory items", e);
44 
        }
 49 
        }
45 
 
 50 
 
46 
        return INDEX;
 51 
        return INDEX;