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.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.HelperClient;
 import in.shop2020.thrift.clients.InventoryClient;
 import in.shop2020.thrift.clients.PurchaseClient;
 import in.shop2020.thrift.clients.WarehouseClient;
+import in.shop2020.utils.HelperService;
 import in.shop2020.utils.ModelUtils;
 import in.shop2020.warehouse.InventoryItem;
 import in.shop2020.warehouse.ScanType;
+import in.shop2020.warehouse.WarehouseService;
 import in.shop2020.warehouse.WarehouseService.Client;
 import in.shop2020.warehouse.WarehouseServiceException;
 import java.util.ArrayList;
 import java.util.Calendar;
     /**
+     *
      */
     private static final int NUM_BULK__SCAN_ITEMS = 10;
     private static Logger logger = LoggerFactory.getLogger(PurchaseController.class);
-    private static enum ScanRecordType { VALID, BLANK };
+    public static enum ScanRecordType { VALID, BLANK };
     private ServletContext context;
     private String id;
+    private Long transferLotId;
     private String itemId;
     private String itemNo;
     private String errorMsg = "";
     private List<Item> items;
     private List<LineItem> lineItems;
     private String invoiceNumber;
     private Double freightCharges ;
     private Long poId;
     private String purchaseOrderId;
+    private Long warehouseId;
+    private Long transferWarehouseId;
     private Warehouse warehouse;
     public String editNew() {
         purchaseOrderId = request.getParameter("poId");
         try {
             in.shop2020.purchase.PurchaseService.Client purchaseClient = new PurchaseClient().getClient();
-            invoices = purchaseClient.getInvoices(getPreviousDay(getPreviousDay(new Date())).getTime());
+            //invoices = purchaseClient.getInvoices(getPreviousDay(getPreviousDay(new Date())).getTime());
+            PurchaseOrder po = purchaseClient.getPurchaseOrder(Long.parseLong(purchaseOrderId));
+            invoices = purchaseClient.getInvoicesForWarehouse(po.getWarehouseId(), po.getSupplierId(), getPreviousDay(getPreviousDay(new Date())).getTime());
         } catch (Exception e) {
             logger.error("Error loading invoices", e);
+        }
         return "new";
+	        	}
+            }
             WarehouseClient warehouseClient = new WarehouseClient();
             Client client = warehouseClient.getClient();
+            in.shop2020.purchase.PurchaseService.Client purchaseClient = new PurchaseClient().getClient();
+            PurchaseOrder po = purchaseClient.getPurchaseOrder(poId);
+            if(transferLotId==null || transferLotId==0) {
+	            if(transferWarehouseId!=null && transferWarehouseId!=0) {
+	            	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);
+	            }
+            }
             for (LineItem lineItem : lineItems) {
                 if (ScanRecordType.BLANK.name().equals(lineItem.getExtra_info())) {
                     continue;
+                }
                 InventoryItem inventoryItem = new InventoryItem();
                 inventoryItem.setItemId(lineItem.getItem_id());
                 inventoryItem.setPurchaseId(Long.parseLong(id));
-                inventoryItem.setCurrentQuantity(0);
+                inventoryItem.setCurrentQuantity(new Double(lineItem.getQuantity()).longValue());
                 inventoryItem.setItemNumber(lineItem.getItem_number());
                 inventoryItem.setSerialNumber(lineItem.getSerial_number());
                 inventoryItem.setInitialQuantity(new Double(lineItem.getQuantity()).longValue());
+                inventoryItem.setPhysicalWarehouseId(po.getWarehouseId());
-                client.scan(inventoryItem, ScanType.PURCHASE, new Double(lineItem.getQuantity()).longValue(), PurchaseOrderController.WAREHOUSE_ID);
+            	client.scan(inventoryItem, ScanType.PURCHASE, new Double(lineItem.getQuantity()).longValue(), warehouseId, (transferLotId!=null)?transferLotId:0L);
+            }
             resetLineItems();
         } catch (TTransportException e) {
             errorMsg = "Error while establishing connection to the warehouse server";
         try {
             items = new ArrayList<Item>();
             in.shop2020.purchase.PurchaseService.Client purchaseClient = new PurchaseClient().getClient();
             //PurchaseOrder purchaseOrder = purchaseClient.getPurchaseOrderForPurchase(id);
             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()));
+            }
             in.shop2020.model.v1.inventory.InventoryService.Client inventoryClient = new InventoryClient().getClient();
-            warehouse = inventoryClient.getWarehouses(WarehouseType.OURS, InventoryType.GOOD, purchaseOrder.getSupplierId(), PurchaseOrderController.WAREHOUSE_ID, PurchaseOrderController.WAREHOUSE_ID).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("Could not create item number mapping", e);
+        }
         return show();
+    }
+    /*public String setTransferItemsOption() {
+    	boolean isTransferAllowed = false;
+    	try {
+			Client warehouseClient = new WarehouseClient().getClient();
+	        isTransferAllowed = warehouseClient.isItemTransferAllowed(warehouseId, transferWarehouseId);
+    	} catch (TTransportException e) {
+            logger.error("Could not create thrift client", e);
+        } catch (TException e) {
+            logger.error("Could not check if item transfer allowed between warehouses", e);
+        }//TODO
+    	return "";
+    }*/
+    public List<Warehouse> getAllowedDestinationWarehousesForTransfer(long originWarehouseId){
+    	try {
+    		WarehouseService.Client warehouseClient = new WarehouseClient().getClient();
+    		List<Long> allowedWarehouseIds = warehouseClient.getAllowedDestinationWarehousesForTransfer(originWarehouseId);
+    		List<Warehouse> allowedWarehouses = new ArrayList<Warehouse>();
+    		InventoryService.Client inventoryClient = new InventoryClient().getClient();
+    		for(Long allowedWarehouseId : allowedWarehouseIds) {
+    			allowedWarehouses.add(inventoryClient.getWarehouse(allowedWarehouseId));
+    		}
+    		return allowedWarehouses;
+    	} catch(Exception e) {
+    		logger.error("Error while getting all destination warehouses for warehouseId " + warehouseId, e);
+    		return new ArrayList<Warehouse>();
+    	}
+    }
     public String itemNumberMappingEditNew() {
         return "item-number-mapping";
+    }
+	}
 	public void setPoId(Long poId) {
 		this.poId = poId;
+	}
+	public Long getWarehouseId() {
+		return warehouseId;
+	}
+	public void setWarehouseId(Long warehouseId) {
+		this.warehouseId = warehouseId;
+	}
+	public Long getTransferWarehouseId() {
+		return transferWarehouseId;
+	}
+	public void setTransferWarehouseId(Long transferWarehouseId) {
+		this.transferWarehouseId = transferWarehouseId;
+	}
+}

Subversion Repositories SmartDukaan

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