Subversion Repositories SmartDukaan

Rev

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

Rev 10497 Rev 14491
Line 7... Line 7...
7
import in.shop2020.thrift.clients.CatalogClient;
7
import in.shop2020.thrift.clients.CatalogClient;
8
import in.shop2020.thrift.clients.InventoryClient;
8
import in.shop2020.thrift.clients.InventoryClient;
9
import in.shop2020.thrift.clients.PurchaseClient;
9
import in.shop2020.thrift.clients.PurchaseClient;
10
import in.shop2020.thrift.clients.WarehouseClient;
10
import in.shop2020.thrift.clients.WarehouseClient;
11
import in.shop2020.utils.ModelUtils;
11
import in.shop2020.utils.ModelUtils;
-
 
12
import in.shop2020.warehouse.DoaOutInventoryItem;
12
import in.shop2020.warehouse.InventoryItem;
13
import in.shop2020.warehouse.InventoryItem;
13
import in.shop2020.warehouse.Scan;
14
import in.shop2020.warehouse.Scan;
14
import in.shop2020.warehouse.ScanType;
15
import in.shop2020.warehouse.ScanType;
15
import in.shop2020.warehouse.WarehouseService.Client;
16
import in.shop2020.warehouse.WarehouseService.Client;
16
 
17
 
Line 27... Line 28...
27
 */
28
 */
28
public class DoaOutController extends BaseController {
29
public class DoaOutController extends BaseController {
29
    private Log logger = LogFactory.getLog(DoaOutController.class);
30
    private Log logger = LogFactory.getLog(DoaOutController.class);
30
    private String id;
31
    private String id;
31
    private String creditNote;
32
    private String creditNote;
32
    List<InventoryItem> inventoryItems;
33
    List<DoaOutInventoryItem> inventoryItems;
33
 
34
 
34
    public String index() {
35
    public String index() {
35
        try {
36
        try {
36
        	//List<InventoryItem> tobeRemovedInventoryItems = new ArrayList<InventoryItem>();
37
        	//List<InventoryItem> tobeRemovedInventoryItems = new ArrayList<InventoryItem>();
37
            Client warehouseClient = new WarehouseClient().getClient();
38
            Client warehouseClient = new WarehouseClient().getClient();
38
            inventoryItems = warehouseClient
39
            inventoryItems = warehouseClient
39
                    .getInventoryItemsFromLastScanType(ScanType.DOA_OUT);
40
                    .getAllDoaOutInventoryItems();
40
           /* for(InventoryItem inventoryItem:inventoryItems) {
41
           /* for(InventoryItem inventoryItem:inventoryItems) {
41
            	if(inventoryItem.getId()<59078 ||  
42
            	if(inventoryItem.getId()<59078 ||  
42
            			inventoryItem.getCurrentWarehouseId() == 1 || 
43
            			inventoryItem.getCurrentWarehouseId() == 1 || 
43
            			inventoryItem.getCurrentWarehouseId() == 9) {//removing doa_in entries before 2013 and all hotspot entries
44
            			inventoryItem.getCurrentWarehouseId() == 9) {//removing doa_in entries before 2013 and all hotspot entries
44
            		tobeRemovedInventoryItems.add(inventoryItem);
45
            		tobeRemovedInventoryItems.add(inventoryItem);
Line 141... Line 142...
141
 
142
 
142
    public void setId(String id) {
143
    public void setId(String id) {
143
        this.id = id;
144
        this.id = id;
144
    }
145
    }
145
 
146
 
146
    public List<InventoryItem> getInventoryItems() {
147
    public List<DoaOutInventoryItem> getInventoryItems() {
147
        return inventoryItems;
148
        return inventoryItems;
148
    }
149
    }
149
 
150
 
150
    public void setInventoryItems(List<InventoryItem> inventoryItems) {
151
    public void setInventoryItems(List<DoaOutInventoryItem> inventoryItems) {
151
        this.inventoryItems = inventoryItems;
152
        this.inventoryItems = inventoryItems;
152
    }
153
    }
153
 
154
 
154
	public String getCreditNote() {
155
	public String getCreditNote() {
155
		return creditNote;
156
		return creditNote;