schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix get_item_warehouse_quantity_map method

Browse Source
This commit is contained in:
NahuelOperto
2019-04-16 11:35:16 -03:00
parent 332b4171c0
commit 07f8e6bbfc
1 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
erpnext/selling/report/available_stock_for_packing_items/available_stock_for_packing_items.py
View File

@@ -12,7 +12,7 @@ def execute(filters=None):
iwq_map = get_item_warehouse_quantity_map() iwq_map = get_item_warehouse_quantity_map()
item_map = get_item_details() item_map = get_item_details()
data = [] data = []
for sbom, warehouse in iwq_map.items(): for sbom, warehouse in iwq_map.items():
total = 0 total = 0
total_qty = 0 total_qty = 0
@@ -21,7 +21,7 @@ def execute(filters=None):
total += 1 total += 1
row = [sbom, item_map.get(sbom).item_name, item_map.get(sbom).description, row = [sbom, item_map.get(sbom).item_name, item_map.get(sbom).description,
item_map.get(sbom).stock_uom, wh] item_map.get(sbom).stock_uom, wh]
available_qty = min(item_qty.values()) available_qty = item_qty
total_qty += flt(available_qty) total_qty += flt(available_qty)
row += [available_qty] row += [available_qty]
@@ -66,15 +66,30 @@ def get_item_warehouse_quantity():
return iwq_map return iwq_map
def get_item_warehouse_quantity_map(): def get_item_warehouse_quantity_map():
query = """SELECT parent, warehouse, MIN(qty) AS qty
FROM (SELECT b.parent, bi.item_code, bi.warehouse,
sum(bi.projected_qty) / b.qty AS qty
FROM tabBin AS bi, (SELECT b.parent, b.item_code, b.qty, w.name
FROM `tabProduct Bundle Item` b, `tabWarehouse` w) AS b
WHERE bi.item_code = b.item_code
AND bi.warehouse = b.name
GROUP BY b.parent, b.item_code, bi.warehouse
UNION ALL
SELECT b.parent, b.item_code, b.name, 0 AS qty
FROM (SELECT b.parent, b.item_code, b.qty, w.name
FROM `tabProduct Bundle Item` b, `tabWarehouse` w) AS b
WHERE NOT EXISTS(SELECT *
FROM `tabBin` AS bi
WHERE bi.item_code = b.item_code
AND bi.warehouse = b.name)) AS r
GROUP BY parent, warehouse
HAVING MIN(qty) != 0"""
result = frappe.db.sql(query, as_dict=1)
last_sbom = ""
sbom_map = {} sbom_map = {}
iwq_map = get_item_warehouse_quantity() for line in result:
sbom_item_map = get_product_bundle_items() if line.get("parent") != last_sbom:
last_sbom = line.get("parent")
for sbom, sbom_items in sbom_item_map.items(): actual_dict = sbom_map.setdefault(last_sbom, {})
for item, child_qty in sbom_items.items(): actual_dict.setdefault(line.get("warehouse"), line.get("qty"))
for wh, qty in iwq_map.get(item, {}).items(): return sbom_map
avail_qty = flt(qty) / flt(child_qty)
sbom_map.setdefault(sbom, {}).setdefault(wh, {}) \
.setdefault(item, avail_qty)
return sbom_map