Subversion Repositories SmartDukaan

Rev

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

Rev 13709 Rev 13713
Line 167... Line 167...
167
		Sheet sheet = wb.getSheetAt(0);
167
		Sheet sheet = wb.getSheetAt(0);
168
		Row firstRow = sheet.getRow(0);
168
		Row firstRow = sheet.getRow(0);
169
		Item item;
169
		Item item;
170
		HsItem hsItem;
170
		HsItem hsItem;
171
		in.shop2020.model.v1.catalog.CatalogService.Client catalogClient;
171
		in.shop2020.model.v1.catalog.CatalogService.Client catalogClient;
-
 
172
		in.shop2020.model.v1.catalog.CatalogService.Client prodCatalogClient;
172
		for (Row row : sheet) {
173
		for (Row row : sheet) {
173
			long orderCountForRow = 0;
174
			long orderCountForRow = 0;
174
			rowId++;
175
			rowId++;
175
			if(row.equals(firstRow))
176
			if(row.equals(firstRow))
176
				continue;
177
				continue;
Line 194... Line 195...
194
 
195
 
195
					Long itemId;
196
					Long itemId;
196
					double totalPrice = 0;
197
					double totalPrice = 0;
197
 
198
 
198
					totalPrice = row.getCell(SUB_ORDER_AMOUNT_INDEX).getNumericCellValue();
199
					totalPrice = row.getCell(SUB_ORDER_AMOUNT_INDEX).getNumericCellValue();
-
 
200
					row.getCell(ITEM_ID_INDEX).setCellType(Cell.CELL_TYPE_STRING);
-
 
201
					String item_Id = row.getCell(ITEM_ID_INDEX).getStringCellValue();
199
 
202
 
200
					LineItem lineItem = null;
203
					LineItem lineItem = null;
201
					try {
204
					try {
202
						catalogClient = new CatalogClient("catalog_service_server_host_amazon","catalog_service_server_port").getClient();
205
						catalogClient = new CatalogClient("catalog_service_server_host_amazon","catalog_service_server_port").getClient();
-
 
206
						prodCatalogClient = new CatalogClient().getClient();
-
 
207
						hsItem = prodCatalogClient.getHsItem(item_Id);
-
 
208
						if(hsItem!=null && hsItem.getItemId()>0){
203
						item = catalogClient.getItem(Long.parseLong(sku));
209
							item = catalogClient.getItem(hsItem.getItemId());
204
						itemId = item.getId();
210
							itemId = item.getId();
205
						if(itemId == 0){
211
							if(itemId == 0){
206
							logger.error("No Item found for " + rowId + " "+ sku);
212
								logger.error("No Item found for " + rowId + " "+ itemId);
-
 
213
								continue;
-
 
214
							}
-
 
215
							lineItem = createLineItem(itemId, totalPrice, row.getCell(QUANTITY_INDEX).getNumericCellValue());
-
 
216
							row.getCell(HS_ORDER_NO_INDEX).setCellType(Cell.CELL_TYPE_STRING);
-
 
217
							row.getCell(HS_SUB_ORDER_NO_INDEX).setCellType(Cell.CELL_TYPE_STRING);
-
 
218
							String hsOrderNo = row.getCell(HS_ORDER_NO_INDEX).getStringCellValue();
-
 
219
							String hsSubOrderNo = row.getCell(HS_SUB_ORDER_NO_INDEX).getStringCellValue();
-
 
220
							lineItem.setExtra_info("HSOrderNo = " + hsOrderNo + " HSSubOrderNo = " + hsSubOrderNo);
-
 
221
						}else{
207
							logger.error("Unable to create order for RowId " + rowId);
222
							logger.error("Unable to get Item Mapping For this HsItemId "+item_Id+"for RowId " + rowId);
-
 
223
							setErrorMsg(getErrorMsg() + "Unable to get Item Mapping For this HsItemId "+item_Id+"for RowId " + rowId);
208
							continue;
224
							continue;
209
						}
225
						}
210
						lineItem = createLineItem(itemId, totalPrice, row.getCell(QUANTITY_INDEX).getNumericCellValue());
-
 
211
						row.getCell(HS_ORDER_NO_INDEX).setCellType(Cell.CELL_TYPE_STRING);
-
 
212
						row.getCell(HS_SUB_ORDER_NO_INDEX).setCellType(Cell.CELL_TYPE_STRING);
-
 
213
						String hsOrderNo = row.getCell(HS_ORDER_NO_INDEX).getStringCellValue();
-
 
214
						String hsSubOrderNo = row.getCell(HS_SUB_ORDER_NO_INDEX).getStringCellValue();
-
 
215
						lineItem.setExtra_info("HSOrderNo = " + hsOrderNo + " HSSubOrderNo = " + hsSubOrderNo);
-
 
216
					} catch (Exception tex) {
226
					} catch (Exception tex) {
217
						logger.error("Unable to create order for RowId " + rowId, tex);
227
						logger.error("Unable to create order for RowId " + rowId, tex);
218
						setErrorMsg(getErrorMsg() + "<br>Unable to create lineitem using catalog info for RowId " + rowId);
228
						setErrorMsg(getErrorMsg() + "<br>Unable to create lineitem using catalog info for RowId " + rowId);
219
						continue;
229
						continue;
220
					}
230
					}
Line 266... Line 276...
266
 
276
 
267
					InventoryService.Client inventoryClient = null;
277
					InventoryService.Client inventoryClient = null;
268
					Warehouse fulfillmentWarehouse= null; 
278
					Warehouse fulfillmentWarehouse= null; 
269
					try {
279
					try {
270
						inventoryClient = new InventoryClient().getClient();
280
						inventoryClient = new InventoryClient().getClient();
271
						Cell warehouseCell = row.getCell(WAREHOUSE_ID_INDEX);
281
						if(hsItem.getDefaultWarehouseId()>0){
272
						if(warehouseCell != null && warehouseCell.getCellType() != Cell.CELL_TYPE_BLANK) {
-
 
273
							fulfillmentWarehouse = inventoryClient.getWarehouse(new Double(row.getCell(WAREHOUSE_ID_INDEX).getNumericCellValue()).longValue());
282
							fulfillmentWarehouse = inventoryClient.getWarehouse(hsItem.getDefaultWarehouseId());
274
						} else {
283
						} else {
275
							List<Long> itemAvailability = inventoryClient.getItemAvailabilityAtLocation(itemId, 1);
284
							List<Long> itemAvailability = inventoryClient.getItemAvailabilityAtLocation(itemId, 1);
276
							fulfillmentWarehouse = inventoryClient.getWarehouse(itemAvailability.get(0));
285
							fulfillmentWarehouse = inventoryClient.getWarehouse(itemAvailability.get(0));
277
						}
286
						}
278
						t_order.setFulfilmentWarehouseId(fulfillmentWarehouse.getId());
287
						t_order.setFulfilmentWarehouseId(fulfillmentWarehouse.getId());
Line 318... Line 327...
318
 
327
 
319
					try {
328
					try {
320
						row.getCell(HS_ORDER_NO_INDEX).setCellType(Cell.CELL_TYPE_STRING);
329
						row.getCell(HS_ORDER_NO_INDEX).setCellType(Cell.CELL_TYPE_STRING);
321
						row.getCell(HS_SUB_ORDER_NO_INDEX).setCellType(Cell.CELL_TYPE_STRING);
330
						row.getCell(HS_SUB_ORDER_NO_INDEX).setCellType(Cell.CELL_TYPE_STRING);
322
						row.getCell(PRODUCT_ID_INDEX).setCellType(Cell.CELL_TYPE_STRING);
331
						row.getCell(PRODUCT_ID_INDEX).setCellType(Cell.CELL_TYPE_STRING);
323
						row.getCell(ITEM_ID_INDEX).setCellType(Cell.CELL_TYPE_STRING);
-
 
324
						row.getCell(CATALOGUE_NAME_INDEX).setCellType(Cell.CELL_TYPE_STRING);
332
						row.getCell(CATALOGUE_NAME_INDEX).setCellType(Cell.CELL_TYPE_STRING);
325
						row.getCell(COURIER_NAME_INDEX).setCellType(Cell.CELL_TYPE_STRING);
333
						row.getCell(COURIER_NAME_INDEX).setCellType(Cell.CELL_TYPE_STRING);
326
						row.getCell(PAYMENT_MODE_INDEX).setCellType(Cell.CELL_TYPE_STRING);
334
						row.getCell(PAYMENT_MODE_INDEX).setCellType(Cell.CELL_TYPE_STRING);
327
 
335
 
328
						String hsOrderNo = row.getCell(HS_ORDER_NO_INDEX).getStringCellValue();
336
						String hsOrderNo = row.getCell(HS_ORDER_NO_INDEX).getStringCellValue();
329
						String hsSubOrderNo = row.getCell(HS_SUB_ORDER_NO_INDEX).getStringCellValue();
337
						String hsSubOrderNo = row.getCell(HS_SUB_ORDER_NO_INDEX).getStringCellValue();
330
						String productId = row.getCell(PRODUCT_ID_INDEX).getStringCellValue();
338
						String productId = row.getCell(PRODUCT_ID_INDEX).getStringCellValue();
331
						String item_Id = row.getCell(ITEM_ID_INDEX).getStringCellValue();
-
 
-
 
339
						
332
						String catalogueName = row.getCell(CATALOGUE_NAME_INDEX).getStringCellValue();
340
						String catalogueName = row.getCell(CATALOGUE_NAME_INDEX).getStringCellValue();
333
						String courierName = row.getCell(COURIER_NAME_INDEX).getStringCellValue();
341
						String courierName = row.getCell(COURIER_NAME_INDEX).getStringCellValue();
334
						String paymentMode = row.getCell(PAYMENT_MODE_INDEX).getStringCellValue();
342
						String paymentMode = row.getCell(PAYMENT_MODE_INDEX).getStringCellValue();
335
						Date hsTxnDate = row.getCell(ORDER_DATE_INDEX).getDateCellValue();
343
						Date hsTxnDate = row.getCell(ORDER_DATE_INDEX).getDateCellValue();
336
 
344