mirror of
https://github.com/frappe/erpnext.git
synced 2026-08-13 14:41:53 +00:00
fix(manufacturing): avoid child BOM cache lookups
This commit is contained in:
@@ -24,6 +24,7 @@ def get_exploded_items(bom, data, indent=0, qty=1):
|
|||||||
fields=[
|
fields=[
|
||||||
"qty",
|
"qty",
|
||||||
"bom_no",
|
"bom_no",
|
||||||
|
"bom_no.quantity as child_bom_qty",
|
||||||
"stock_qty",
|
"stock_qty",
|
||||||
"item_code",
|
"item_code",
|
||||||
"item_name",
|
"item_name",
|
||||||
@@ -51,12 +52,11 @@ def get_exploded_items(bom, data, indent=0, qty=1):
|
|||||||
}
|
}
|
||||||
)
|
)
|
||||||
if item.bom_no:
|
if item.bom_no:
|
||||||
child_bom_qty = frappe.get_cached_value("BOM", item.bom_no, "quantity")
|
|
||||||
get_exploded_items(
|
get_exploded_items(
|
||||||
item.bom_no,
|
item.bom_no,
|
||||||
data,
|
data,
|
||||||
indent=indent + 1,
|
indent=indent + 1,
|
||||||
qty=qty * item.stock_qty / child_bom_qty,
|
qty=qty * item.stock_qty / item.child_bom_qty,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ from erpnext.manufacturing.report.bom_explorer.bom_explorer import get_exploded_
|
|||||||
|
|
||||||
class TestBOMExplorer(unittest.TestCase):
|
class TestBOMExplorer(unittest.TestCase):
|
||||||
def test_nested_bom_normalizes_and_accumulates_qty(self):
|
def test_nested_bom_normalizes_and_accumulates_qty(self):
|
||||||
def item(item_code, qty, stock_qty, bom_no="", uom="Nos"):
|
def item(item_code, qty, stock_qty, bom_no="", uom="Nos", child_bom_qty=None):
|
||||||
return frappe._dict(
|
return frappe._dict(
|
||||||
item_code=item_code,
|
item_code=item_code,
|
||||||
item_name=item_code,
|
item_name=item_code,
|
||||||
@@ -19,29 +19,24 @@ class TestBOMExplorer(unittest.TestCase):
|
|||||||
qty=qty,
|
qty=qty,
|
||||||
stock_qty=stock_qty,
|
stock_qty=stock_qty,
|
||||||
bom_no=bom_no,
|
bom_no=bom_no,
|
||||||
|
child_bom_qty=child_bom_qty,
|
||||||
uom=uom,
|
uom=uom,
|
||||||
idx=1,
|
idx=1,
|
||||||
is_phantom_item=0,
|
is_phantom_item=0,
|
||||||
)
|
)
|
||||||
|
|
||||||
children = {
|
children = {
|
||||||
"root": [item("parent", 2, 20, "parent-bom", "Box")],
|
"root": [item("parent", 2, 20, "parent-bom", "Box", 5)],
|
||||||
"parent-bom": [item("child", 3, 12, "child-bom", "Pack")],
|
"parent-bom": [item("child", 3, 12, "child-bom", "Pack", 4)],
|
||||||
"child-bom": [item("raw-material", 2, 2, uom="Kg")],
|
"child-bom": [item("raw-material", 2, 2, uom="Kg")],
|
||||||
}
|
}
|
||||||
bom_quantities = {"parent-bom": 5, "child-bom": 4}
|
|
||||||
|
|
||||||
def get_items(_doctype, filters, **kwargs):
|
def get_items(_doctype, filters, **kwargs):
|
||||||
|
self.assertIn("bom_no.quantity as child_bom_qty", kwargs["fields"])
|
||||||
return children[filters["parent"]]
|
return children[filters["parent"]]
|
||||||
|
|
||||||
def get_bom_quantity(_doctype, name, _fieldname):
|
|
||||||
return bom_quantities[name]
|
|
||||||
|
|
||||||
data = []
|
data = []
|
||||||
with (
|
with patch.object(frappe, "get_all", side_effect=get_items):
|
||||||
patch.object(frappe, "get_all", side_effect=get_items),
|
|
||||||
patch.object(frappe, "get_cached_value", side_effect=get_bom_quantity),
|
|
||||||
):
|
|
||||||
get_exploded_items("root", data)
|
get_exploded_items("root", data)
|
||||||
|
|
||||||
self.assertEqual([row["qty"] for row in data], [2, 12, 24])
|
self.assertEqual([row["qty"] for row in data], [2, 12, 24])
|
||||||
|
|||||||
Reference in New Issue
Block a user