Subversion Repositories SmartDukaan

Rev

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

Rev 21247 Rev 21252
Line 145... Line 145...
145
			List<Long> order_ids = new ArrayList<Long>();
145
			List<Long> order_ids = new ArrayList<Long>();
146
			order_ids.addAll(orderIdSet);
146
			order_ids.addAll(orderIdSet);
147
 
147
 
148
			boolean status = client.addBillingDetailsForGrouppedOrders(order_ids, "", itemNumbersMap, serialNumbersMap, freebieWarehouseIdMap , user, jacket_number, billing_type, false, invoice_type);
148
			boolean status = client.addBillingDetailsForGrouppedOrders(order_ids, "", itemNumbersMap, serialNumbersMap, freebieWarehouseIdMap , user, jacket_number, billing_type, false, invoice_type);
149
 
149
 
150
 
-
 
151
			if(!status)
150
			if(!status)
152
				return "Couldn't add billing info on server";
151
				return "Couldn't add billing info on server";
153
 
152
 
154
			return "Billing Info added successfully";
153
			return "Billing Info added successfully";
155
		}  catch(TransactionServiceException tse){
154
		}  catch(TransactionServiceException tse){
156
			logger.error("Exception while adding InventoryServiceHandlerjacket number", tse);
155
			logger.error("Exception while adding InventoryServiceHandlerjacket number", tse);
157
			return "Error While Billing Order:" + tse.getMessage();
156
			return "Error While Billing Order:" + tse.getMessage();
158
		} catch (TException e) {
157
		} catch (TException e) {
159
			return "Unknown exception from server:" + e.getMessage();
158
			return "Unknown exception from server:" + e.getMessage();
160
		}
159
		}
161
 
-
 
162
 
-
 
163
	}
160
	}
164
 
161
 
165
	public String checkBillingDetails(){
162
	public String checkBillingDetails(){
166
		try{
163
		try{
167
			Client tc = new TransactionClient().getClient();
164
			Client tc = new TransactionClient().getClient();
Line 203... Line 200...
203
		}
200
		}
204
		logger.info("itemQuantityMap "+itemQuantityMap);
201
		logger.info("itemQuantityMap "+itemQuantityMap);
205
		logger.info("inventoryItemMap "+inventoryItemMap);
202
		logger.info("inventoryItemMap "+inventoryItemMap);
206
		for(Map.Entry<Long, Long> entry : itemQuantityMap.entrySet()){
203
		for(Map.Entry<Long, Long> entry : itemQuantityMap.entrySet()){
207
			List<InventoryItem> inventory_items = inventoryItemMap.get(entry.getKey());
204
			List<InventoryItem> inventory_items = inventoryItemMap.get(entry.getKey());
-
 
205
			if (inventory_items == null){
-
 
206
				return "Mismatch in inventory items.Quantity to bill "+entry.getValue()+".InventoryItem available 0 for item_id "+entry.getKey();
-
 
207
			}
208
			if (inventory_items == null || inventory_items.size()!= entry.getValue()){
208
			if (inventory_items.size()!= entry.getValue()){
209
				return "Mismatch in serial number and item mapping";
209
				return "Mismatch in inventory items.Quantity to bill "+entry.getValue()+".InventoryItem available "+inventory_items.size()+" for item_id "+entry.getKey();
210
			}
210
			}
211
		}
211
		}
212
		for (Order o : orders_list){
212
		for (Order o : orders_list){
213
 
213
 
214
			freebieWarehouseIdMap.put(o.getId(), new ArrayList<Long>());
214
			freebieWarehouseIdMap.put(o.getId(), new ArrayList<Long>());