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.InventoryType;
 import in.shop2020.model.v1.catalog.Item;
+import in.shop2020.model.v1.catalog.ItemType;
 import in.shop2020.model.v1.catalog.Warehouse;
 import in.shop2020.model.v1.catalog.WarehouseType;
 import in.shop2020.model.v1.order.LineItem;
 import in.shop2020.purchase.PurchaseOrder;
 import in.shop2020.purchase.PurchaseServiceException;
             LineItem lineItem = new LineItem();
             lineItem.setId(i);
             lineItem.setExtra_info("");
             lineItem.setSerial_number("");
             lineItem.setItem_number("");
+            lineItem.setQuantity(1);
             lineItem.setItem_id(-1);
             lineItems.add(lineItem);
+        }
+    }
             for (LineItem lineItem : lineItems) {
                 if (ScanRecordType.BLANK.name().equals(lineItem.getExtra_info())) {
                     continue;
+                }
-                InventoryItem inventoryItem = null;
-                if (lineItem.getItem_id() != -1) {
+                if (ItemType.SERIALIZED.name().equals(lineItem.getProductGroup())) {
-                    inventoryItem = client.createSerializedInventoryItem(lineItem.getItem_id(), lineItem.getItem_number(), lineItem.getSerial_number(), id);
+                    InventoryItem inventoryItem = client.createSerializedInventoryItem(lineItem.getItem_id(), lineItem.getItem_number(), lineItem.getSerial_number(), id);
+                    client.scanSerializedItem(inventoryItem, ScanType.PURCHASE, PurchaseOrderController.WAREHOUSE_ID);
+                }
                 else {
-                    inventoryItem = client.createSerializedInventoryItemFromItemNumber(lineItem.getItem_number(), lineItem.getSerial_number(), id);
+                    InventoryItem inventoryItem = client.createInventoryItem(lineItem.getItem_id(), new Double(lineItem.getQuantity()).longValue(), id);
+                    client.scan(inventoryItem, ScanType.PURCHASE, new Double(lineItem.getQuantity()).longValue()
+                            , PurchaseOrderController.WAREHOUSE_ID);
+                }
-                client.scanSerializedItem(inventoryItem, ScanType.PURCHASE, PurchaseOrderController.WAREHOUSE_ID);
+            }
             resetLineItems();
         } catch (TTransportException e) {
             errorMsg = "Error while establishing connection to the warehouse server";
             logger.error(errorMsg, e);
         } catch (WarehouseServiceException e) {
             if (lineItem.getItem_id() == -1 && lineItem.getItem_number().isEmpty() && lineItem.getSerial_number().isEmpty()) {
                 lineItem.setExtra_info(ScanRecordType.BLANK.name());
+            }
             else {
                 lineItem.setExtra_info(ScanRecordType.VALID.name());
+                if (ItemType.SERIALIZED.name().equals(lineItem.getProductGroup())) {
-                if (lineItem.getSerial_number().isEmpty()) {
+                    if (lineItem.getSerial_number().isEmpty()) {
-                    lineItem.setExtra_info("Serial number not present.");
+                        lineItem.setExtra_info("Serial number not present.");
+                        areValidScans = false;
+                        continue;
+                    }
+                    try {
+                        warehouseClient.getInventoryItem(lineItem.getSerial_number());
+                        lineItem.setExtra_info("Item scanned already.");
-                    areValidScans = false;
+                        areValidScans = false;
-                    continue;
+                        continue;
+                    }
+                    catch (Exception e) {
+                    }
+                }
                 if (lineItem.getItem_id() == -1 && lineItem.getItem_number().isEmpty()) {
                     lineItem.setExtra_info("Item not selected/Item number not present.");
                     areValidScans = false;
+                        }
                         if (numItemsInPO > 1) {
                             lineItem.setExtra_info("Multiple items found for given item Number. Choose item explicitly.");
                             areValidScans = false;
                             continue;
+                        }
+                    }
+                }
                 if (!itemsQuantityMapFromPO.containsKey(lineItem.getItem_id())) {
                     lineItem.setExtra_info("Item not present in PO.");
                     areValidScans = false;
                     continue;
+                }
+                itemsQuantityMapFromPO.put(lineItem.getItem_id(),
-                itemsQuantityMapFromPO.put(lineItem.getItem_id(), itemsQuantityMapFromPO.get(lineItem.getItem_id()) - 1);
+                        itemsQuantityMapFromPO.get(lineItem.getItem_id()) - new Double(lineItem.getQuantity()).longValue());
                 if (itemsQuantityMapFromPO.get(lineItem.getItem_id()) < 0) {
                     lineItem.setExtra_info("Item already fulfilled in PO.");
                     areValidScans = false;
                     continue;
+                }
-                try {
-                    warehouseClient.getInventoryItem(lineItem.getSerial_number());
-                    lineItem.setExtra_info("Item scanned already.");
-                    areValidScans = false;
-                    continue;
-                }
-                catch (Exception e) {
-                }
+            }
+        }
         return areValidScans;
+    }
     private void setItemsFromPO(long id) {
         try {
             items = new ArrayList<Item>();
             in.shop2020.purchase.PurchaseService.Client purchaseClient = new PurchaseClient().getClient();
             PurchaseOrder purchaseOrder = purchaseClient.getPurchaseOrderForPurchase(id);
+            in.shop2020.model.v1.catalog.InventoryService.Client catalogClient = new CatalogClient().getClient();
             for (in.shop2020.purchase.LineItem lineItem : purchaseOrder.getLineitems()) {
                 Item item = new Item();
                 item.setId(lineItem.getItemId());
                 item.setBrand(lineItem.getBrand());
                 item.setModelName(lineItem.getModelName());
                 item.setModelNumber(lineItem.getModelNumber());
                 item.setColor(lineItem.getColor());
+                item.setProductGroup(catalogClient.getItem(lineItem.getItemId()).getType().name());
                 items.add(item);
+            }
-            in.shop2020.model.v1.catalog.InventoryService.Client catalogClient = new CatalogClient().getClient();
             warehouse = catalogClient.getWarehouses(WarehouseType.OURS, InventoryType.GOOD, purchaseOrder.getSupplierId(), PurchaseOrderController.WAREHOUSE_ID, PurchaseOrderController.WAREHOUSE_ID).get(0);
         } catch (Exception e) {
             logger.error("Could not find items in PO with purchase: " + id, e);
+        }
+    }

Subversion Repositories SmartDukaan

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