Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: improve bom autoname logic

Browse Source
This commit is contained in:
Rohan Bansal 2022-02-16 15:55:25 +05:30 committed by Ankush Menat
parent e2c99e02a9
commit 7f2670941c
1 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
erpnext/manufacturing/doctype/bom/bom.py
View File

@ -2,6 +2,7 @@
# License: GNU General Public License v3. See license.txt # License: GNU General Public License v3. See license.txt
import functools import functools
import re
from collections import deque from collections import deque
from operator import itemgetter from operator import itemgetter
from typing import List from typing import List
@ -103,27 +104,34 @@ class BOM(WebsiteGenerator):
) )
def autoname(self): def autoname(self):
names = frappe.db.sql_list("""select name from `tabBOM` where item=%s""", self.item) existing_boms = frappe.get_all("BOM", filters={"item": self.item})
if existing_boms:
existing_bom_names = [bom.name for bom in existing_boms]
if names: # split by "/" and "-"
# name can be BOM/ITEM/001, BOM/ITEM/001-1, BOM-ITEM-001, BOM-ITEM-001-1 delimiters = ["/", "-"]
pattern = "|".join(map(re.escape, delimiters))
bom_parts = [re.split(pattern, bom_name) for bom_name in existing_bom_names]
# split by item # filter out BOMs that do not follow the following formats:
names = [name.split(self.item, 1) for name in names] # - BOM/ITEM/001
names = [d[-1][1:] for d in filter(lambda x: len(x) > 1 and x[-1], names)] # - BOM/ITEM/001-1
# - BOM-ITEM-001
# - BOM-ITEM-001-1
valid_bom_parts = list(filter(lambda x: len(x) > 1 and x[-1], bom_parts))
# split by (-) if cancelled # extract the current index from the BOM parts
if names: if valid_bom_parts:
names = [cint(name.split('-')[-1]) for name in names] indexes = [cint(part[-1]) for part in valid_bom_parts]
idx = max(names) + 1 index = max(indexes) + 1
else: else:
idx = 1 index = 1
else: else:
idx = 1 index = 1
prefix = self.doctype prefix = self.doctype
suffix = "%.3i" % idx suffix = "%.3i" % index # convert index to string (1 -> "001")
bom_name = prefix + "-" + self.item + "-" + suffix bom_name = f"{prefix}-{self.item}-{suffix}"
if len(bom_name) <= 140: if len(bom_name) <= 140:
name = bom_name name = bom_name
@ -134,7 +142,7 @@ class BOM(WebsiteGenerator):
truncated_item_name = self.item[:truncated_length] truncated_item_name = self.item[:truncated_length]
# if a partial word is found after truncate, remove the extra characters # if a partial word is found after truncate, remove the extra characters
truncated_item_name = truncated_item_name.rsplit(" ", 1)[0] truncated_item_name = truncated_item_name.rsplit(" ", 1)[0]
name = prefix + "-" + truncated_item_name + "-" + suffix name = f"{prefix}-{truncated_item_name}-{suffix}"
if frappe.db.exists("BOM", name): if frappe.db.exists("BOM", name):
conflicting_bom = frappe.get_doc("BOM", name) conflicting_bom = frappe.get_doc("BOM", name)