Subversion Repositories SmartDukaan

Rev

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

Rev 7410 Rev 7448
Line 88... Line 88...
88 
		}
 88 
		}
89 
	}
 89 
	}
90
90
91 
	public String index(){
 91 
	public String index(){
92 
		if(warehouseMap==null||warehouseMap.size()<1){
 92 
		if(warehouseMap==null||warehouseMap.size()<1){
93 
	//TODO		fetchWarehouseMap();
 93 
			fetchWarehouseMap();
94 
		}
 94 
		}
95 
		try{
 95 
		try{
96 
			WarehouseService.Client warehouseClient = new WarehouseClient().getClient();
 96 
			WarehouseService.Client warehouseClient = new WarehouseClient().getClient();
97 
			transferLotFromDate = Calendar.getInstance();
 97 
			transferLotFromDate = Calendar.getInstance();
98 
			transferLotToDate = Calendar.getInstance();
 98 
			transferLotToDate = Calendar.getInstance();
Line 113... Line 113...
113 
			logger.error("Error in getting transfer lots", wsex);
 113 
			logger.error("Error in getting transfer lots", wsex);
114 
		}
 114 
		}
115 
		return INDEX;
 115 
		return INDEX;
116 
	}
 116 
	}
117
117
- 
 
 118 
    private void fetchWarehouseMap() {
- 
 
 119 
    	warehouseMap = new HashMap<Long, Warehouse>();
- 
 
 120 
		InventoryClient inventoryServiceClient;
- 
 
 121 
		try {
- 
 
 122 
			inventoryServiceClient = new InventoryClient();
- 
 
 123 
	        Client inventoryClient = inventoryServiceClient.getClient();
- 
 
 124 
	        List<Warehouse> warehouses;
- 
 
 125 
			warehouses = inventoryClient.getAllWarehouses(true);
- 
 
 126 
	        for(Warehouse warehouse : warehouses){
- 
 
 127 
	        	warehouseMap.put(warehouse.getId(), warehouse);
- 
 
 128 
	        }
- 
 
 129 
		} catch (TTransportException e) {
- 
 
 130 
			logger.error("Error in populating warehouse map", e);
- 
 
 131 
		} catch (TException e) {
- 
 
 132 
			logger.error("Error in populating warehouse map", e);
- 
 
 133 
		} catch (InventoryServiceException isex) {
- 
 
 134 
			logger.error("Error in populating warehouse map", isex);
- 
 
 135 
		}
- 
 
 136 
	}
- 
 
 137 
 
118 
    public String create() {
 138 
	public String create() {
119 
    	originWarehouseId = Long.parseLong(request.getParameter("originWarehouseId"));
 139 
    	originWarehouseId = Long.parseLong(request.getParameter("originWarehouseId"));
120 
    	destinationWarehouseId = Long.parseLong(request.getParameter("destinationWarehouseId"));
 140 
    	destinationWarehouseId = Long.parseLong(request.getParameter("destinationWarehouseId"));
121 
    	try {
 141 
    	try {
122 
	    	WarehouseService.Client warehouseClient = new WarehouseClient().getClient();
 142 
	    	WarehouseService.Client warehouseClient = new WarehouseClient().getClient();
123 
	        id = warehouseClient.createTransferLot(originWarehouseId, destinationWarehouseId);
 143 
	        id = warehouseClient.createTransferLot(originWarehouseId, destinationWarehouseId);
Line 140... Line 160...
140 
			if(!areValidScans()){
 160 
			if(!areValidScans()){
141 
				errorMessage = "Invalid Scans";
 161 
				errorMessage = "Invalid Scans";
142 
				return show();
 162 
				return show();
143 
			}
 163 
			}
144 
			if(id == null || id==0) {
 164 
			if(id == null || id==0) {
145 
	            //if(!createPurchase()) {
 - 
 
146 
	            	errorMessage = "No transferLot-Id selected for Transfer";
 165 
	            	errorMessage = "No transferLot-Id selected for Transfer";
147 
	        		return "new";
 166 
	        		return "new";
148 
	        	//}
 - 
 
149 
	        }
 167 
	        }
150 
			List<InventoryItem> inventoryItems = new ArrayList<InventoryItem>();
 168 
			List<InventoryItem> inventoryItems = new ArrayList<InventoryItem>();
151 
			CatalogService.Client catalogClient = new CatalogClient().getClient();
 169 
			CatalogService.Client catalogClient = new CatalogClient().getClient();
152 
			for (LineItem lineItem : lineItems) {
 170 
			for (LineItem lineItem : lineItems) {
153 
                if (lineItem.getItem_id() == 0) {
 171 
                if (lineItem.getItem_id() == 0) {
Line 161... Line 179...
161 
                	inventoryItem.setSerialNumber(lineItem.getSerial_number());
 179 
                	inventoryItem.setSerialNumber(lineItem.getSerial_number());
162 
                }
 180 
                }
163 
                inventoryItems.add(inventoryItem);
 181 
                inventoryItems.add(inventoryItem);
164 
            }
 182 
            }
165 
			WarehouseService.Client warehouseClient = new WarehouseClient().getClient();
 183 
			WarehouseService.Client warehouseClient = new WarehouseClient().getClient();
166 
			warehouseClient.scanForTransfer(inventoryItems, ScanType.WAREHOUSE_TRANSFER_OUT, id);
 184 
			warehouseClient.scanForTransferOut(inventoryItems, ScanType.WAREHOUSE_TRANSFER_OUT, id);
167 
		} catch (TTransportException e) {
 185 
		} catch (TTransportException e) {
168 
            errorMessage = "Error while establishing connection to the warehouse server";
 186 
            errorMessage = "Error while establishing connection to the warehouse server";
169 
            logger.error(errorMessage, e);
 187 
            logger.error(errorMessage, e);
170 
        } catch (WarehouseServiceException e) {
 188 
        } catch (WarehouseServiceException e) {
171 
        	errorMessage = e.getMessage();
 189 
        	errorMessage = e.getMessage();