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

 import in.shop2020.model.v1.inventory.InventoryService;
 import in.shop2020.model.v1.inventory.InventoryType;
 import in.shop2020.model.v1.inventory.Warehouse;
 import in.shop2020.model.v1.inventory.WarehouseType;
 import in.shop2020.model.v1.order.LineItem;
-import in.shop2020.purchase.Invoice;
 import in.shop2020.purchase.PurchaseOrder;
 import in.shop2020.purchase.PurchaseServiceException;
 import in.shop2020.thrift.clients.CatalogClient;
 import in.shop2020.thrift.clients.InventoryClient;
 import in.shop2020.thrift.clients.PurchaseClient;
+			}
+		}
 		return true;
+	}
-	private void areValidSerializedItems() throws Exception {
+	private void areValidSerializedItems(Map<String, LineItem> serialNumbersMap) throws Exception {
 		Client warehouseClient = new WarehouseClient().getClient();
-		for (LineItem lineItem : lineItems) {
+		List<String> serialNumbers = new ArrayList<String>(serialNumbersMap.keySet());
-			if (StringUtils.isNotBlank(lineItem.getSerial_number())) {
+		List<InventoryItem> inventoryItems = warehouseClient.getInventoryItemsBySerailNumbers(serialNumbers);
-				InventoryItem inventoryItem = new InventoryItem();
+		for(InventoryItem inventoryItem : inventoryItems) {
-				try{
-					inventoryItem = warehouseClient.getInventoryItem(lineItem.getSerial_number());
+			log.info("serialNumber -           --" + inventoryItem.getSerialNumber());
-				} catch(Exception e){
-					continue;
-				}
-				if(inventoryItem.getLastScanType()!=ScanType.PURCHASE_RETURN && inventoryItem.getLastScanType()!=ScanType.DOA_REPLACED) {
+			if(inventoryItem.getLastScanType()!=ScanType.PURCHASE_RETURN && inventoryItem.getLastScanType()!=ScanType.DOA_REPLACED) {
-					lineItem.setExtra_info("Item scanned already.");
+				LineItem lineItem = serialNumbersMap.remove(inventoryItem.getSerialNumber());
-					exceptionList.add("Items Scanned already : "+ lineItem.getSerial_number());
+				exceptionList.add("Item exist already : "+ lineItem.getSerial_number());
-					continue;
+				continue;
-				}
+			}
-			}
+		}
+	}
 	private void setItemsFromPO() {
 		try {
 				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();
+				//Logic to create transfer lot pending yet
 				if(!transferLotCreate(po)){
 					return create();
+				}
+				Map<String, LineItem> serialNumbersMap = new HashMap<String, LineItem>();
 				if(selectItemType.equalsIgnoreCase("SERIALIZED")){
 					Item item = serializedMap.get(Long.parseLong(bulkScanUploadItem));
 					itemType = item.getType();
 					for(in.shop2020.purchase.LineItem pItem : poLineItems){
 						if(pItem.getItemId() == item.getId()){
 							poLineItem = pItem;
+							if (poLineItem.getUnfulfilledQuantity() == 0) {
+								errorMsg = "Error occurred"
+									+ "<br> Item uploaded is already fulfilled";
+								addActionError(errorMsg);
+								return create();
+							}
 							break;
+						}
+					}
 					BufferedReader br = new BufferedReader(new FileReader(fileToCreate));
 								addActionError(errorMsg);
 								return create();
+							}
 							line++;
 							continue;
+							// Maximum upload for an item is 500
+						} else if (line > 501) {
+							errorMsg = "Error Occurred"
+									+ "<br> Can process upto 500 records only";
+							addActionError(errorMsg);
+							return create();
+						} else if (poLineItem.getUnfulfilledQuantity() < line - 1){
+							errorMsg = "Error occurred"
+								+ "<br> SerialNumbers uploaded should not be greater than unfulfilled Quantity";
+							addActionError(errorMsg);
+							return create();
+						}
 						values = strLine.split("\t");
-						for(String s : values){
-							logger.info("Row No "+line+" :"+s);
-							System.out.println("Row No "+line+" :"+s);
-						}
 						LineItem lineItem = new LineItem();
 						lineItem.setId(line);
 						lineItem.setItem_id(item.getId());
 						lineItem.setBrand(item.getBrand());
 						lineItem.setColor(item.getColor());
 							if(StringUtils.isNotBlank(values[0]) && StringUtils.isNotEmpty(values[0])){
 								if(StringUtils.isNotBlank(values[1]) && StringUtils.isNotEmpty(values[1])){
 									lineItem.setItem_number(values[0].trim());
 									lineItem.setSerial_number(values[1].trim());
 									lineItem.setQuantity(1);
+									logger.info(serialNumbersMap.size() + " ------ " +  lineItem.getSerial_number());
+									if (serialNumbersMap.containsKey(lineItem.getSerial_number())){
+										errorRowsMap.put(line, "Error: Serial Number is duplicate in sheet");
+										line++;
+										continue;
+									} else {
+										serialNumbersMap.put(lineItem.getSerial_number(), lineItem);
-									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;
+						}
 						if(correctRowsMap.containsKey(line) && !errorRowsMap.containsKey(line)){
 							lineItems.add(lineItem);
+						}
-						line++;
-					}
-					areValidSerializedItems();
-				}else{
-					BufferedReader br = new BufferedReader(new FileReader(fileToCreate));
-					long line = 1;
-					String strLine;
-					String[] values;
-					while((strLine = br.readLine())!=null){
-						if(strLine.trim().isEmpty()){
-							continue;
-						}
-						if(line==1){
-							values = strLine.split("\t");
-							if(values.length !=4){
-								errorMsg = errorMsg + "<br> File contains Inappropriate Content ";
-								addActionError(errorMsg);
-								return create();
-							}
-							line++;
-							continue;
-						}
-						values = strLine.split("\t");
-						for(String s : values){
-							logger.info("Row No "+line+" :"+s);
-							System.out.println("Row No "+line+" :"+s);
-						}
-						Item item = nonserializedMap.get(Long.parseLong(values[0]));
-						itemType = item.getType();
-						for(in.shop2020.purchase.LineItem pItem : poLineItems){
-							if(pItem.getItemId() == item.getId()){
-								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{
-									errorRowsMap.put(line, "Error: Invalid Item Quantity ");
-									line++;
-									continue;
-								}
-							} else{
-								errorRowsMap.put(line, "Error: Item Number Missing ");
-								line++;
-								continue;
-							}
-						}
-						if(correctRowsMap.containsKey(line) && !errorRowsMap.containsKey(line)){
-							lineItems.add(lineItem);
-						}
 						line++;
+					}
+					areValidSerializedItems(serialNumbersMap);
+				}
-				if(correctRowsMap!=null && correctRowsMap.size()>0){
-					if(errorRowsMap!=null && errorRowsMap.size()>0){
+				if(errorRowsMap!=null && errorRowsMap.size()>0){
-						for(Long row : errorRowsMap.keySet()){
+					for(Long row : errorRowsMap.keySet()){
-							exceptionList.add("At Row "+ row +" "+ errorRowsMap.get(row));
+						exceptionList.add("At Row "+ row +" "+ errorRowsMap.get(row));
-						}
+					}
+				}
-				else{
+				if(correctRowsMap.size()==0){
 					exceptionList.add("-- File Contains Zero Correct Records --");
 					if(errorRowsMap!=null && errorRowsMap.size()>0){
 						exceptionList.add("-- Data in uploaded sheet is Inappropriate --");
+					}
+				}
+				if(!checkForException()) {
+					return null;
+				}
 				if(id == null || Long.parseLong(id)==0) {
 					if(!createPurchase()) {
 						if(!checkForException()){
 							return create();
+						}
 	            long currentWarehouseId = 0;
 	            if(!checkDirectScanWarehouse){
 	            	Warehouse fulfilmentWarehouse = inventoryClient.getWarehouses(WarehouseType.OURS, InventoryType.GOOD, po.getSupplierId(), po.getWarehouseId(), 0).get(0);
 	            	currentWarehouseId = fulfilmentWarehouse.getId();
+	            }
-				for (LineItem lineItem : lineItems) {
+	            List<InventoryItem> inventoryItems = new ArrayList<InventoryItem>();
+				for (LineItem lineItem : serialNumbersMap.values()) {
 					InventoryItem inventoryItem = new InventoryItem();
 					inventoryItem.setItemId(lineItem.getItem_id());
 					inventoryItem.setPurchaseId(Long.parseLong(id));
-					inventoryItem.setCurrentQuantity(0);
+					inventoryItem.setCurrentQuantity(1);
 					inventoryItem.setItemNumber(lineItem.getItem_number());
 					inventoryItem.setSerialNumber(lineItem.getSerial_number());
-					inventoryItem.setInitialQuantity(new Double(lineItem.getQuantity()).longValue());
+					log.info("inventory Item serial number --- " + lineItem.getSerial_number());
+					inventoryItem.setInitialQuantity(1);
+					inventoryItem.setLastScanType(ScanType.PURCHASE);
 	                if(checkDirectScanWarehouse){
 	                	inventoryItem.setPhysicalWarehouseId(po.getWarehouseId());
 	                	inventoryItem.setCurrentWarehouseId(po.getWarehouseId());
 	                }else{
 	                	inventoryItem.setPhysicalWarehouseId(po.getWarehouseId());
 	                	inventoryItem.setCurrentWarehouseId(currentWarehouseId);
+	                }
-					if(!client.isAlive()){
-						client = warehouseClient.getClient();
+					inventoryItems.add(inventoryItem);
-					}
-					try{
-						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);
-						if(lineItem.getSerial_number()!=null && !lineItem.getSerial_number().isEmpty()){
-							exceptionList.add("Item with Serial Number "+ lineItem.getSerial_number() + " Scanned Successfully");
-						}
-						else{
-							exceptionList.add("Item with Item Number "+ lineItem.getItem_number() + " with "+ lineItem.getQuantity() + " units Scanned Successfully");
-						}
-					}
-					catch(Exception e){
-						exceptionList.add("Error "+lineItem.getId()+" "+e.getMessage());
-						continue;
-					}
+				}
-				if(lineItems!= null && lineItems.size()!=exceptionList.size()){
-					if(!checkForException()){
-						return null;
-					}
-				}else{
+				try{
+					client.scanPurchaseBulk(inventoryItems);
 					successMsg = "Items scanned Successfully.<br>Check the unfulfilled Quantity for further details";
+					addActionMessage(successMsg);
+				}
+				catch(Exception e){
+					addActionError("Error -  Could not scan in items due to " + e.getMessage());
+				}
 			} catch (Exception e) {
 				errorMsg = errorMsg + " <br> Error while scanning items";
 				logger.error(errorMsg, e);
 				e.printStackTrace();
+			}
+		}
 		return create();
+	}
 	public String destroy() {
 		long id = Long.parseLong(this.id);
 		try {
 			PurchaseClient warehouseClient = new PurchaseClient();

Subversion Repositories SmartDukaan

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