Subversion Repositories SmartDukaan

Rev

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

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