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



    billing_warehouse_retid = None
    
    if not ignoreAvailability:
        for entry in CurrentInventorySnapshot.query.filter_by(item_id = item_id).all():
            entry.reserved = max(entry.reserved, 0)
            entry.held = max(entry.held, 0)
            #if entry.availability > entry.reserved:
            warehousesAvailability[entry.warehouse_id] = [entry.availability, entry.reserved, entry.held] 
 
    if len(ignoredWhs) > 0:
        for whid in ignoredWhs:

    minTransferDelayWarehouses = {}
    total_availability = 0
 
    for entry in CurrentInventorySnapshot.query.filter_by(item_id = item_id).all():
        entry.reserved = max(entry.reserved, 0)
        entry.held = max(entry.held, 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 - entry.held

    max_availability = 0
    total_availability = 0
 
    for entry in CurrentInventorySnapshot.query.filter_by(item_id = item_id).all():
        entry.reserved = max(entry.reserved, 0)
        entry.held = max(entry.held, 0)
        if entry.warehouse_id in warehouse_ids:
            availability = entry.availability - entry.reserved
            if availability > max_availability:
                warehouse_retid = entry.warehouse_id
                max_availability = availability

Subversion Repositories SmartDukaan

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

Rev 8497		Rev 8524
Line 620...		Line 620...
620	`billing_warehouse_retid = None`	620	`billing_warehouse_retid = None`
621		621
622	`if not ignoreAvailability:`	622	`if not ignoreAvailability:`
623	`for entry in CurrentInventorySnapshot.query.filter_by(item_id = item_id).all():`	623	`for entry in CurrentInventorySnapshot.query.filter_by(item_id = item_id).all():`
624	`entry.reserved = max(entry.reserved, 0)`	624	`entry.reserved = max(entry.reserved, 0)`
-		625	`entry.held = max(entry.held, 0)`
625	`#if entry.availability > entry.reserved:`	626	`#if entry.availability > entry.reserved:`
626	`warehousesAvailability[entry.warehouse_id] = [entry.availability, entry.reserved, entry.held]`	627	`warehousesAvailability[entry.warehouse_id] = [entry.availability, entry.reserved, entry.held]`
627		628
628	`if len(ignoredWhs) > 0:`	629	`if len(ignoredWhs) > 0:`
629	`for whid in ignoredWhs:`	630	`for whid in ignoredWhs:`
Line 670...		Line 671...
670	`minTransferDelayWarehouses = {}`	671	`minTransferDelayWarehouses = {}`
671	`total_availability = 0`	672	`total_availability = 0`
672		673
673	`for entry in CurrentInventorySnapshot.query.filter_by(item_id = item_id).all():`	674	`for entry in CurrentInventorySnapshot.query.filter_by(item_id = item_id).all():`
674	`entry.reserved = max(entry.reserved, 0)`	675	`entry.reserved = max(entry.reserved, 0)`
-		676	`entry.held = max(entry.held, 0)`
675	`if warehouses.has_key(entry.warehouse_id):`	677	`if warehouses.has_key(entry.warehouse_id):`
676	`warehouse = warehouses[entry.warehouse_id]`	678	`warehouse = warehouses[entry.warehouse_id]`
677	`#if entry.availability > entry.reserved:`	679	`#if entry.availability > entry.reserved:`
678	`if entry.warehouse_id not in ignoredWhs:`	680	`if entry.warehouse_id not in ignoredWhs:`
679	`total_availability += entry.availability - entry.reserved - entry.held`	681	`total_availability += entry.availability - entry.reserved - entry.held`
Line 693...		Line 695...
693	`max_availability = 0`	695	`max_availability = 0`
694	`total_availability = 0`	696	`total_availability = 0`
695		697
696	`for entry in CurrentInventorySnapshot.query.filter_by(item_id = item_id).all():`	698	`for entry in CurrentInventorySnapshot.query.filter_by(item_id = item_id).all():`
697	`entry.reserved = max(entry.reserved, 0)`	699	`entry.reserved = max(entry.reserved, 0)`
-		700	`entry.held = max(entry.held, 0)`
698	`if entry.warehouse_id in warehouse_ids:`	701	`if entry.warehouse_id in warehouse_ids:`
699	`availability = entry.availability - entry.reserved`	702	`availability = entry.availability - entry.reserved`
700	`if availability > max_availability:`	703	`if availability > max_availability:`
701	`warehouse_retid = entry.warehouse_id`	704	`warehouse_retid = entry.warehouse_id`
702	`max_availability = availability`	705	`max_availability = availability`