WebSVN – SmartDukaan – Diff – /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/BulkPurchaseController.java

 	private String errorMsg = "";
 	private String successMsg = "";
 	private List<Item> items;
 	private List<LineItem> lineItems;
 	private String bulkScanUploadItem;
+	private String selectItemType;
 	private File scanDataFile;
 	private String invoiceNumber;
 	private Double freightCharges ;
 	private String purchaseComments;
 	private Long transferWarehouseId;
 	private Warehouse warehouse;
 	private Warehouse thirdPartyWarehouse;
 	private Map<Long, Double> unfulfilledMap = new HashMap<Long, Double>();
+	private Map<Long, Item> nonserializedMap = new HashMap<Long, Item>();
+	private Map<Long, Item> serializedMap = new HashMap<Long, Item>();
 	public String show() {
 		resetLineItems();
 		setItemsFromPO();
 			PurchaseOrder purchaseOrder = purchaseClient.getPurchaseOrder(poId);
 			warehouseId = purchaseOrder.getWarehouseId();
 			in.shop2020.model.v1.catalog.CatalogService.Client catalogClient = new CatalogClient().getClient();
 			for (in.shop2020.purchase.LineItem lineItem : purchaseOrder.getLineitems()) {
-				items.add(catalogClient.getItem(lineItem.getItemId()));
+				Item it = catalogClient.getItem(lineItem.getItemId());
+				if(it.getType()==ItemType.SERIALIZED){
+					serializedMap.put(it.getId(), it);
+				}else{
+					nonserializedMap.put(it.getId(), it);
+				}
+				items.add(it);
 				unfulfilledMap.put(lineItem.getItemId(), lineItem.getUnfulfilledQuantity());
+			}
 			in.shop2020.model.v1.inventory.InventoryService.Client inventoryClient = new InventoryClient().getClient();
             thirdPartyWarehouse = inventoryClient.getWarehouse(warehouseId);
 			logger.error("Could not find items in PO with purchase: " + id, e);
+		}
+	}
 	public String update() {
+		if(selectItemType.equalsIgnoreCase("SERIALIZED")){
-		if(("-1").equalsIgnoreCase(bulkScanUploadItem)){
+			if(("-1").equalsIgnoreCase(bulkScanUploadItem)){
-			errorMsg = errorMsg +" <br> No Item Selected to Scan In";
+				errorMsg = errorMsg +" <br> No Item Selected to Scan In";
-			return show();
+				return show();
+			}
+		}
 		File fileToCreate = getScanFileToRead();
 		Map<Long, String> correctRowsMap = new HashMap<Long, String>();
 		Map<Long, String> errorRowsMap = new HashMap<Long, String>();
+		}
 		ItemType itemType = ItemType.SERIALIZED;
 		setItemsFromPO();
 		lineItems = new ArrayList<LineItem>();
 		if(fileToCreate.isFile()){
-			try{
+			try {
-				in.shop2020.model.v1.catalog.CatalogService.Client catalogClient = new CatalogClient().getClient();
-				Item item = catalogClient.getItem(Long.parseLong(bulkScanUploadItem));
-				itemType = item.getType();
 				in.shop2020.purchase.PurchaseService.Client purchaseClient = new PurchaseClient().getClient();
 				PurchaseOrder po = purchaseClient.getPurchaseOrder(poId);
 				List<in.shop2020.purchase.LineItem> poLineItems = po.getLineitems();
 				in.shop2020.purchase.LineItem poLineItem = new in.shop2020.purchase.LineItem();
-				for(in.shop2020.purchase.LineItem pItem : poLineItems){
-					if(pItem.getItemId() == item.getId()){
-						poLineItem = pItem;
-						break;
-					}
-				}
 				if(!transferLotCreate(po)){
 					return create();
+				}
-				BufferedReader br = new BufferedReader(new FileReader(fileToCreate));
+				if(selectItemType.equalsIgnoreCase("SERIALIZED")){
-				long line = 1;
-				String strLine;
+					Item item = serializedMap.get(Long.parseLong(bulkScanUploadItem));
-				String[] values;
-				while((strLine = br.readLine())!=null){
+					itemType = item.getType();
-					if(line==1){
-						values = strLine.split("\t");
+					for(in.shop2020.purchase.LineItem pItem : poLineItems){
-						if(values.length !=3){
+						if(pItem.getItemId() == item.getId()){
-							errorMsg = errorMsg + "<br> File contains Inappropriate Content ";
-							addActionError(errorMsg);
+							poLineItem = pItem;
-							return create();
+							break;
+						}
-						line++;
-						continue;
+					}
+					BufferedReader br = new BufferedReader(new FileReader(fileToCreate));
+					long line = 1;
+					String strLine;
+					String[] values;
+					while((strLine = br.readLine())!=null){
+						if(line==1){
+							values = strLine.split("\t");
+							if(values.length !=3){
+								errorMsg = errorMsg + "<br> File contains Inappropriate Content ";
+								addActionError(errorMsg);
+								return create();
+							}
+							line++;
+							continue;
+						}
-					values = strLine.split("\t");
+						values = strLine.split("\t");
-					for(String s : values){
+						for(String s : values){
-						logger.info("Row No "+line+" :"+s);
+							logger.info("Row No "+line+" :"+s);
-						System.out.println("Row No "+line+" :"+s);
+							System.out.println("Row No "+line+" :"+s);
-					}
+						}
-					LineItem lineItem = new LineItem();
+						LineItem lineItem = new LineItem();
-					lineItem.setId(line);
+						lineItem.setId(line);
-					lineItem.setItem_id(item.getId());
+						lineItem.setItem_id(item.getId());
-					lineItem.setBrand(item.getBrand());
+						lineItem.setBrand(item.getBrand());
-					lineItem.setColor(item.getColor());
+						lineItem.setColor(item.getColor());
-					lineItem.setModel_name(item.getModelName());
+						lineItem.setModel_name(item.getModelName());
-					lineItem.setModel_number(item.getModelNumber());
+						lineItem.setModel_number(item.getModelNumber());
-					lineItem.setProductGroup(item.getProductGroup());
+						lineItem.setProductGroup(item.getProductGroup());
-					lineItem.setNlc(poLineItem.getNlc());
+						lineItem.setNlc(poLineItem.getNlc());
-					lineItem.setTransfer_price(poLineItem.getUnitPrice());
+						lineItem.setTransfer_price(poLineItem.getUnitPrice());
-					lineItem.setUnit_price(poLineItem.getUnitPrice());
+						lineItem.setUnit_price(poLineItem.getUnitPrice());
-					if(itemType==ItemType.SERIALIZED){
+						if(itemType==ItemType.SERIALIZED){
-						if(StringUtils.isNotBlank(values[0]) && StringUtils.isNotEmpty(values[0])){
+							if(StringUtils.isNotBlank(values[0]) && StringUtils.isNotEmpty(values[0])){
-							if(StringUtils.isNotBlank(values[1]) && StringUtils.isNotEmpty(values[1])){
+								if(StringUtils.isNotBlank(values[1]) && StringUtils.isNotEmpty(values[1])){
-								lineItem.setItem_number(values[0].trim());
+									lineItem.setItem_number(values[0].trim());
-								lineItem.setSerial_number(values[1].trim());
+									lineItem.setSerial_number(values[1].trim());
-								lineItem.setQuantity(1);
+									lineItem.setQuantity(1);
-								correctRowsMap.put(line, "Entries are correct in the row");
+									correctRowsMap.put(line, "Entries are correct in the row");
+								}
+								else{
+									errorRowsMap.put(line, "Error: Serial Number Missing ");
+									line++;
+									continue;
+								}
+							}
 							else{
-								errorRowsMap.put(line, "Error: Serial Number Missing ");
+								errorRowsMap.put(line, "Error: Item Number Missing ");
 								line++;
 								continue;
+							}
+						}
+						if(correctRowsMap.containsKey(line) && !errorRowsMap.containsKey(line)){
+							lineItems.add(lineItem);
+						}
+						line++;
+					}
+					areValidSerializedItems();
-						else{
+				}else{
+					BufferedReader br = new BufferedReader(new FileReader(fileToCreate));
+					long line = 1;
+					String strLine;
+					String[] values;
+					while((strLine = br.readLine())!=null){
+						if(line==1){
+							values = strLine.split("\t");
+							if(values.length !=4){
-							errorRowsMap.put(line, "Error: Item Number Missing ");
+								errorMsg = errorMsg + "<br> File contains Inappropriate Content ";
+								addActionError(errorMsg);
+								return create();
+							}
 							line++;
 							continue;
+						}
+						values = strLine.split("\t");
-					}
+						for(String s : values){
-					if(itemType==ItemType.NON_SERIALIZED){
+							logger.info("Row No "+line+" :"+s);
-						if(StringUtils.isNotBlank(values[0]) && StringUtils.isNotEmpty(values[0])){
+							System.out.println("Row No "+line+" :"+s);
+						}
-							lineItem.setItem_number(values[0].trim());
+						Item item = nonserializedMap.get(Long.parseLong(values[0]));
-							lineItem.setSerial_number("");
+						itemType = item.getType();
-							if(StringUtils.isNotBlank(values[2]) && StringUtils.isNumeric(values[2]) && Double.parseDouble(values[2]) > 0){
+						for(in.shop2020.purchase.LineItem pItem : poLineItems){
-								lineItem.setQuantity(Double.parseDouble(values[2].trim()));
+							if(pItem.getItemId() == item.getId()){
-								correctRowsMap.put(line, "Entries are correct in the row ");
+								poLineItem = pItem;
+								break;
+							}
+						}
+						LineItem lineItem = new LineItem();
+						lineItem.setId(line);
+						lineItem.setItem_id(item.getId());
+						lineItem.setBrand(item.getBrand());
+						lineItem.setColor(item.getColor());
+						lineItem.setModel_name(item.getModelName());
+						lineItem.setModel_number(item.getModelNumber());
+						lineItem.setProductGroup(item.getProductGroup());
+						lineItem.setNlc(poLineItem.getNlc());
+						lineItem.setTransfer_price(poLineItem.getUnitPrice());
+						lineItem.setUnit_price(poLineItem.getUnitPrice());
+						if(itemType==ItemType.NON_SERIALIZED){
+							if(StringUtils.isNotBlank(values[1]) && StringUtils.isNotEmpty(values[1])){
+								lineItem.setItem_number(values[1].trim());
+								lineItem.setSerial_number("");
+								if(StringUtils.isNotBlank(values[3]) && StringUtils.isNumeric(values[3]) && Double.parseDouble(values[3]) > 0){
+									lineItem.setQuantity(Double.parseDouble(values[3].trim()));
+									correctRowsMap.put(line, "Entries are correct in the row ");
+								}
-							else{
+								else{
-								errorRowsMap.put(line, "Error: Invalid Item Quantity ");
+									errorRowsMap.put(line, "Error: Invalid Item Quantity ");
+									line++;
+									continue;
+								}
+							} else{
+								errorRowsMap.put(line, "Error: Item Number Missing ");
 								line++;
 								continue;
+							}
-						} else{
-							errorRowsMap.put(line, "Error: Item Number Missing ");
-							line++;
-							continue;
+						}
+						if(correctRowsMap.containsKey(line) && !errorRowsMap.containsKey(line)){
+							lineItems.add(lineItem);
-					}
+						}
-					if(correctRowsMap.containsKey(line) && !errorRowsMap.containsKey(line)){
-						lineItems.add(lineItem);
+						line++;
+					}
-					line++;
+				}
 				if(correctRowsMap!=null && correctRowsMap.size()>0){
 					if(errorRowsMap!=null && errorRowsMap.size()>0){
 						for(Long row : errorRowsMap.keySet()){
 							exceptionList.add("At Row "+ row +" "+ errorRowsMap.get(row));
+						}
 					if(errorRowsMap!=null && errorRowsMap.size()>0){
 						exceptionList.add("-- Data in uploaded sheet is Inappropriate --");
+					}
+				}
-				if(itemType==ItemType.SERIALIZED){
-					areValidSerializedItems();
-				}
 				if(id == null || Long.parseLong(id)==0) {
 					if(!createPurchase()) {
 						if(!checkForException()){
 							return create();
+						}
+					}
 				}
 				WarehouseClient warehouseClient = new WarehouseClient();
 				Client client = warehouseClient.getClient();
 				InventoryService.Client inventoryClient = new InventoryClient().getClient();
 				boolean checkDirectScanWarehouse = false;
+	                }
 					if(!client.isAlive()){
 						client = warehouseClient.getClient();
+					}
 					try{
-						if(itemType==ItemType.SERIALIZED){
+						if(lineItem.getSerial_number()!=null && !lineItem.getSerial_number().isEmpty()){
 							if(lineItem.getExtra_info()!=null && "Item scanned already.".equalsIgnoreCase(lineItem.getExtra_info())){
 								continue;
+							}
+						}
 						client.scan(inventoryItem, ScanType.PURCHASE, new Double(lineItem.getQuantity()).longValue(), warehouseId, (transferLotId!=null)?transferLotId:0L);
 						return null;
+					}
 				}else{
 					successMsg = "Items scanned Successfully.<br>Check the unfulfilled Quantity for further details";
+				}
-			} catch(Exception e){
+			} catch (Exception e) {
 				errorMsg = errorMsg + " <br> Error while scanning items";
 				logger.error(errorMsg, e);
+				e.printStackTrace();
+			}
+		}
 		return create();
+	}

Subversion Repositories SmartDukaan

(root)/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/BulkPurchaseController.java – Rev 16490 → 18668