Subversion Repositories SmartDukaan

Rev

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

Rev 5945 Rev 5948
Line 9... Line 9...
9
import in.shop2020.model.v1.inventory.Warehouse;
9
import in.shop2020.model.v1.inventory.Warehouse;
10
import in.shop2020.model.v1.order.LineItem;
10
import in.shop2020.model.v1.order.LineItem;
11
import in.shop2020.model.v1.order.OrderStatus;
11
import in.shop2020.model.v1.order.OrderStatus;
12
import in.shop2020.model.v1.order.TransactionService.Client;
12
import in.shop2020.model.v1.order.TransactionService.Client;
13
import in.shop2020.thrift.clients.CatalogClient;
13
import in.shop2020.thrift.clients.CatalogClient;
-
 
14
import in.shop2020.thrift.clients.InventoryClient;
14
import in.shop2020.thrift.clients.TransactionClient;
15
import in.shop2020.thrift.clients.TransactionClient;
15
 
16
 
16
import java.io.ByteArrayOutputStream;
17
import java.io.ByteArrayOutputStream;
17
import java.io.File;
18
import java.io.File;
18
import java.io.FileNotFoundException;
19
import java.io.FileNotFoundException;
Line 207... Line 208...
207
		String pickFromWarehouse = null;
208
		String pickFromWarehouse = null;
208
		Item item = null;
209
		Item item = null;
209
 
210
 
210
        try {
211
        try {
211
            in.shop2020.model.v1.catalog.CatalogService.Client client = new CatalogClient().getClient();
212
            in.shop2020.model.v1.catalog.CatalogService.Client client = new CatalogClient().getClient();
-
 
213
            in.shop2020.model.v1.inventory.InventoryService.Client inventoryClient = new InventoryClient().getClient();
212
            item = client.getItem(lineItem.getItem_id());
214
            item = client.getItem(lineItem.getItem_id());
213
            pickFromWarehouse = CatalogUtils.getWarehousesForBillingWarehouse(t_order.getWarehouse_id())
215
            pickFromWarehouse = CatalogUtils.getWarehousesForBillingWarehouse(t_order.getWarehouse_id())
214
                                    .get(t_order.getFulfilmentWarehouseId());
216
                                    .get(t_order.getFulfilmentWarehouseId());
215
 
217
 
216
            if (pickFromWarehouse == null) {
218
            if (pickFromWarehouse == null) {
217
                Warehouse warehouse = client.getWarehouse(t_order.getFulfilmentWarehouseId());
219
                Warehouse warehouse = inventoryClient.getWarehouse(t_order.getFulfilmentWarehouseId());
218
                pickFromWarehouse = client.getWarehouses(null, InventoryType.GOOD, warehouse.getVendor().getId(), t_order.getWarehouse_id(), 0).get(0).getDisplayName();
220
                pickFromWarehouse = inventoryClient.getWarehouses(null, InventoryType.GOOD, warehouse.getVendor().getId(), t_order.getWarehouse_id(), 0).get(0).getDisplayName();
219
            }
221
            }
220
		}
222
		}
221
        catch (Exception e) {
223
        catch (Exception e) {
222
            logger.error("Error looking up warehouse: " + t_order.getVendorId(), e);
224
            logger.error("Error looking up warehouse: " + t_order.getVendorId(), e);
223
        }
225
        }