WebSVN – SmartDukaan – Diff – //trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataAcessors.py

 from shop2020.model.v1.inventory.impl.DataService import Warehouse, \
     ItemInventoryHistory, CurrentInventorySnapshot, VendorItemPricing, \
     VendorItemMapping, Vendor, MissedInventoryUpdate, BadInventorySnapshot, \
     VendorItemProcurementDelay, VendorHolidays, ItemAvailabilityCache, \
     CurrentReservationSnapshot, IgnoredInventoryUpdateItems, ItemStockPurchaseParams, \
-    OOSStatus, AmazonInventorySnapshot, StateMaster
+    OOSStatus, AmazonInventorySnapshot, StateMaster, HoldInventoryDetail
 from shop2020.thriftpy.model.v1.inventory.ttypes import \
     InventoryServiceException, HolidayType, InventoryType, WarehouseType
 from shop2020.thriftpy.model.v1.order.ttypes import AlertType
 from shop2020.thriftpy.purchase.ttypes import PurchaseServiceException
 from shop2020.utils import EmailAttachmentSender
     reservation.created_timestamp = to_py_date(created_timestamp)
     reservation.promised_shipping_timestamp = to_py_date(promised_shipping_timestamp)
     reservation.reserved = quantity
     session.commit()
+    try:
+        order_client = TransactionClient().get_client()
+        order = order_client.getOrder(order_id)
+        holdInventoryDetail = HoldInventoryDetail.query.filter_by(item_id = item_id, warehouse_id = warehouse_id, source = order.source).first()
+        if holdInventoryDetail is not None:
+            holdInventoryDetail.held = holdInventoryDetail.held -quantity
+            current_inventory_snapshot = CurrentInventorySnapshot.get_by(item_id=item_id, warehouse_id=warehouse_id)
+            if current_inventory_snapshot is not None:
+                if current_inventory_snapshot.held>0:
+                    current_inventory_snapshot.held = current_inventory_snapshot.held - quantity
+            session.commit()
+    except:
+        print "Unable to release hold Inventory for item_id " + str(item_id) + " warehouse_id " + str(warehouse_id) + " source " + str(source_id)
     #**Update item availability cache**#
     clear_item_availability_cache(item_id)
     return True
 def update_reservation_for_order(item_id, warehouse_id, source_id, order_id, created_timestamp, promised_shipping_timestamp, quantity):
     new_reservation.order_id = order_id
     new_reservation.created_timestamp = to_py_date(created_timestamp)
     new_reservation.promised_shipping_timestamp = to_py_date(promised_shipping_timestamp)
     new_reservation.reserved = quantity
+    try:
+        order_client = TransactionClient().get_client()
+        order = order_client.getOrder(order_id)
+        holdInventoryDetail = HoldInventoryDetail.query.filter_by(item_id = item_id, warehouse_id = warehouse_id, source = order.source).first()
+        if holdInventoryDetail is not None:
+            holdInventoryDetail.held = holdInventoryDetail.held -quantity
+            current_inventory_snapshot = CurrentInventorySnapshot.get_by(item_id=item_id, warehouse_id=warehouse_id)
+            if current_inventory_snapshot is not None:
+                if current_inventory_snapshot.held>0:
+                    current_inventory_snapshot.held = current_inventory_snapshot.held - quantity
+            session.commit()
+    except:
+        print "Unable to release hold Inventory for item_id " + str(item_id) + " warehouse_id " + str(warehouse_id) + " source " + str(source_id)
     order_client = TransactionClient().get_client()
     order = order_client.getOrder(order_id)
     for lineitem in order.lineitems:
         query = CurrentInventorySnapshot.query.filter_by(warehouse_id = order.fulfilmentWarehouseId, item_id = lineitem.item_id)
         try:
             try:
                 if current_inventory_snapshot.reserved < 0:
                     item = __get_item_from_master(lineitem.item_id)
                     __send_alert_for_negative_reserved(item, current_inventory_snapshot.reserved, get_Warehouse(order.fulfilmentWarehouseId))
             except:
-                print "Error in send negative reserved alert:", sys.exc_info()[0]
+                print "Error in sending negative reserved alert:", sys.exc_info()[0]
                 return False
         except:
             print "Error in reducing reservation for item:", sys.exc_info()[0]
             return False
     session.commit()
     if not ignoreAvailability:
         for entry in CurrentInventorySnapshot.query.filter_by(item_id = item_id).all():
             entry.reserved = max(entry.reserved, 0)
             #if entry.availability > entry.reserved:
-            warehousesAvailability[entry.warehouse_id] = [entry.availability, entry.reserved]
+            warehousesAvailability[entry.warehouse_id] = [entry.availability, entry.reserved, entry.held]
     if len(ignoredWhs) > 0:
         for whid in ignoredWhs:
             if warehousesAvailability.has_key(whid):
                 warehousesAvailability[whid][0] = 0
                 warehousesAvailability[whid][1] = 0
+                warehousesAvailability[whid][2] = 0
     for warehouse in warehouses.values():
         if not ignoreAvailability:
             #TODO Mistake no entry for this warehouse.id in warehouseswithAvailab
             if warehouse.id not in warehousesAvailability:
                 continue
             entry = warehousesAvailability[warehouse.id]
             if warehouse.billingWarehouseId in availabilityForBillingWarehouses:
                 if warehouse.billingWarehouseId is not None or warehouse.billingWarehouseId != 0:
-                    availabilityForBillingWarehouses[warehouse.billingWarehouseId] = availabilityForBillingWarehouses[warehouse.billingWarehouseId] + entry[0] - entry[1]
+                    availabilityForBillingWarehouses[warehouse.billingWarehouseId] = availabilityForBillingWarehouses[warehouse.billingWarehouseId] + entry[0] - entry[1] - entry[2]
             else:
                 if warehouse.billingWarehouseId is not None or warehouse.billingWarehouseId != 0:
-                    availabilityForBillingWarehouses[warehouse.billingWarehouseId] = entry[0] - entry[1]
+                    availabilityForBillingWarehouses[warehouse.billingWarehouseId] = entry[0] - entry[1] - entry[2]
-            if entry[0] <= entry[1]:
+            if entry[0] <= (entry[1] + entry[2]):
                 continue
-            total_availability += entry[0] - entry[1]
+            total_availability += entry[0] - entry[1] - entry[2]
         # Missing transfer price cases should not impact warehouse assignment
         transferPrice = None
         if item_pricing.has_key(warehouse.vendor_id):
             transferPrice = item_pricing[warehouse.vendor_id].nlc
         entry.reserved = max(entry.reserved, 0)
         if warehouses.has_key(entry.warehouse_id):
             warehouse = warehouses[entry.warehouse_id]
             #if entry.availability > entry.reserved:
             if entry.warehouse_id not in ignoredWhs:
-                total_availability += entry.availability - entry.reserved
+                total_availability += entry.availability - entry.reserved - entry.held
-            if entry.availability - entry.reserved <= 0:
+            if entry.availability - entry.reserved - entry.held <= 0:
                 continue
             transferDelay = warehouse.transferDelayInHours
             if minTransferDelay is None or minTransferDelay >= transferDelay:
                 if minTransferDelay != transferDelay:
                     minTransferDelayWarehouses = {}
     else:
         inventory.availability = amazoninventorysnapshot.availability
         inventory.reserved = amazoninventorysnapshot.reserved
     session.commit()
+def add_update_hold_inventory(itemId, warehouseId, holdQuantity, source):
+    holdInventoryDetail = HoldInventoryDetail.get_by(item_id = itemId, warehouse_id=warehouseId, source = source)
+    if  holdInventoryDetail is None:
+        diffTobeAddedInCIS = holdQuantity
+        hold_inventory_detail = HoldInventoryDetail()
+        hold_inventory_detail.item_id = itemId
+        hold_inventory_detail.warehouse_id = warehouseId
+        hold_inventory_detail.held = holdQuantity
+        hold_inventory_detail.source = source
+    else:
+        hold_inventory_detail.held = holdQuantity
+        diffTobeAddedInCIS = holdQuantity - holdInventoryDetail.held
+    current_inventory_snapshot = CurrentInventorySnapshot.get_by(item_id=itemId, warehouse_id=warehouseId)
+    if not current_inventory_snapshot:
+        current_inventory_snapshot = CurrentInventorySnapshot()
+        current_inventory_snapshot.item_id = itemId
+        current_inventory_snapshot.warehouse_id = warehouseId
+        current_inventory_snapshot.availability = 0
+        current_inventory_snapshot.reserved = 0
+        current_inventory_snapshot.held = 0
+    current_inventory_snapshot.held = current_inventory_snapshot.held + diffTobeAddedInCIS
+    session.commit()
+    #**Update item availability cache**#
+    clear_item_availability_cache(itemId)

Subversion Repositories SmartDukaan

(root)//trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataAcessors.py – Rev 8026 → 8182