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

 package in.shop2020.inventory.controllers;
 import in.shop2020.model.v1.catalog.Item;
 import in.shop2020.model.v1.inventory.InventoryService;
+import in.shop2020.model.v1.inventory.InventoryServiceException;
 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.POStatus;*/
 import in.shop2020.purchase.PurchaseOrder;
+/*import in.shop2020.purchase.PurchaseService;*/
 import in.shop2020.purchase.PurchaseServiceException;
 import in.shop2020.thrift.clients.CatalogClient;
 import in.shop2020.thrift.clients.HelperClient;
 import in.shop2020.thrift.clients.InventoryClient;
 import in.shop2020.thrift.clients.PurchaseClient;
+     *
      */
     private static final int NUM_BULK__SCAN_ITEMS = 10;
     private static Logger logger = LoggerFactory.getLogger(PurchaseController.class);
     public static enum ScanRecordType { VALID, BLANK };
+    private static final long DUMMY_VENDOR_ID = 40;
     private ServletContext context;
     private String id;
     private Long transferLotId;
     private String itemId;
     private List<Invoice> invoices;
     private String invoiceNumber;
     private Double freightCharges ;
     private Long poId;
+    private String purchaseComments;
     private String purchaseOrderId;
     private Long warehouseId;
     private Long transferWarehouseId;
     private Warehouse warehouse;
+    private Warehouse thirdPartyWarehouse;
     public String editNew() {
         purchaseOrderId = request.getParameter("poId");
         try {
+        }
+    }
     public boolean createPurchase(){
         try {
-        	logger.info("poId="+poId+" invoiceNumber="+invoiceNumber+" freightCharges="+freightCharges);
+        	logger.info("poId="+poId+" invoiceNumber="+invoiceNumber+" freightCharges="+freightCharges+ " purchaseComments= "+purchaseComments);
             PurchaseClient purchaseClient = new PurchaseClient();
             in.shop2020.purchase.PurchaseService.Client client = purchaseClient
                     .getClient();
-            id = "" + client.startPurchase(poId, invoiceNumber, freightCharges);
+            id = "" + client.startPurchase(poId, invoiceNumber, freightCharges, purchaseComments);
             logger.info("id = "+id);
         } catch (TTransportException e) {
             errorMsg = "Error while establishing connection to the warehouse server";
             logger.error(errorMsg, e);
         } catch (TException e) {
 	            	InventoryService.Client inventoryClient = new InventoryClient().getClient();
 	                Warehouse fulfilmentWarehouse = inventoryClient.getWarehouses(WarehouseType.OURS, InventoryType.GOOD, po.getSupplierId(), po.getWarehouseId(), 0L).get(0);
 	            	transferLotId = client.createTransferLot(po.getWarehouseId(), transferWarehouseId);
+	            }
+            }
+            boolean checkDirectScanWarehouse = false;
+            if(thirdPartyWarehouse.getVendor().getId()==DUMMY_VENDOR_ID && thirdPartyWarehouse.getInventoryType()==InventoryType.GOOD && thirdPartyWarehouse.getWarehouseType()==WarehouseType.OURS_THIRDPARTY){
+            	checkDirectScanWarehouse = true;
+            }
             for (LineItem lineItem : lineItems) {
                 if (ScanRecordType.BLANK.name().equals(lineItem.getExtra_info())) {
                     continue;
+                }
                 inventoryItem.setCurrentQuantity(0);
                 inventoryItem.setItemNumber(lineItem.getItem_number());
                 inventoryItem.setSerialNumber(lineItem.getSerial_number());
                 inventoryItem.setInitialQuantity(new Double(lineItem.getQuantity()).longValue());
                 inventoryItem.setPhysicalWarehouseId(po.getWarehouseId());
+                logger.info("checkDirectScanWarehouse..... "+ checkDirectScanWarehouse);
+                if(checkDirectScanWarehouse){
+                	logger.info("Come into this loop.... where direct scan Warehouse Id exist");
+                	inventoryItem.setPhysicalWarehouseId(po.getWarehouseId());
+                	inventoryItem.setCurrentWarehouseId(po.getWarehouseId());
+                }else{
+                	logger.info("Come into this loop.... where direct scan Warehouse Id Not Exist");
+                	inventoryItem.setPhysicalWarehouseId(po.getWarehouseId());
+                }
+                if(!client.isAlive()){
+					client = warehouseClient.getClient();
+				}
             	client.scan(inventoryItem, ScanType.PURCHASE, new Double(lineItem.getQuantity()).longValue(), warehouseId, (transferLotId!=null)?transferLotId:0L);
+            }
             resetLineItems();
         } catch (TTransportException e) {
             for (in.shop2020.purchase.LineItem lineItem : purchaseOrder.getLineitems()) {
                 items.add(catalogClient.getItem(lineItem.getItemId()));
+            }
             in.shop2020.model.v1.inventory.InventoryService.Client inventoryClient = new InventoryClient().getClient();
+            thirdPartyWarehouse = inventoryClient.getWarehouse(warehouseId);
+            if(thirdPartyWarehouse.getVendor().getId()==DUMMY_VENDOR_ID && thirdPartyWarehouse.getInventoryType()==InventoryType.GOOD && thirdPartyWarehouse.getWarehouseType()==WarehouseType.OURS_THIRDPARTY){
+            	warehouse = thirdPartyWarehouse;
+            } else {
-            warehouse = inventoryClient.getWarehouses(WarehouseType.OURS, InventoryType.GOOD, purchaseOrder.getSupplierId(), warehouseId, warehouseId).get(0);
+            	warehouse = inventoryClient.getWarehouses(WarehouseType.OURS, InventoryType.GOOD, purchaseOrder.getSupplierId(), warehouseId, warehouseId).get(0);
+            }
         } catch (Exception e) {
             logger.error("Could not find items in PO with purchase: " + id, e);
+        }
+    }
     		logger.error("Error while getting all destination warehouses for warehouseId " + warehouseId, e);
     		return new ArrayList<Warehouse>();
+    	}
+    }
+/*	public boolean canItemCanBeScannedIn(long id) {
+		double itemWeight = 0.0;
+		try {
+			in.shop2020.model.v1.catalog.CatalogService.Client catalogClient = new CatalogClient().getClient();
+			Item item = catalogClient.getItem(id);
+			itemWeight = item.getWeight();
+		} catch (Exception e) {
+			logger.error("Could not fetch item to get weight of it ", e);
+		}
+		if(itemWeight> 0.0){
+			return true;
+		}
+		return false;
+	}
+*/
     public String itemNumberMappingEditNew() {
         return "item-number-mapping";
+    }
     public String getName(Item item){
+	}
 	public void setTransferLotId(Long transferLotId) {
 		this.transferLotId = transferLotId;
+	}
+	public String getPurchaseComments() {
+		return purchaseComments;
+	}
+	public void setPurchaseComments(String purchaseComments) {
+		this.purchaseComments = purchaseComments;
+	}
+	public Warehouse getThirdPartyWarehouse() {
+		return thirdPartyWarehouse;
+	}
+	public void setThirdPartyWarehouse(Warehouse thirdPartyWarehouse) {
+		this.thirdPartyWarehouse = thirdPartyWarehouse;
+	}
+}

Subversion Repositories SmartDukaan

(root)/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseController.java – Rev 8217 → 11801