warehack.ing/WireViz
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move default qty value=1 to BOM deduplication

Browse Source
This commit is contained in:
KV 2021-01-05 04:12:05 +01:00
parent d15eeb1f9f
commit 2e244981fe
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/wireviz/wv_bom.py
View File

@ -58,7 +58,7 @@ def generate_bom(harness: "Harness") -> List[BOMEntry]:
+ (f', {connector.pincount} pins' if connector.show_pincount else '') + (f', {connector.pincount} pins' if connector.show_pincount else '')
+ (f', {connector.color}' if connector.color else '')) + (f', {connector.color}' if connector.color else ''))
bom_entries.append({ bom_entries.append({
'item': description, 'qty': 1, 'unit': None, 'designators': connector.name if connector.show_name else None, 'item': description, 'designators': connector.name if connector.show_name else None,
'manufacturer': connector.manufacturer, 'mpn': connector.mpn, 'pn': connector.pn 'manufacturer': connector.manufacturer, 'mpn': connector.mpn, 'pn': connector.pn
}) })
@ -96,11 +96,8 @@ def generate_bom(harness: "Harness") -> List[BOMEntry]:
# add cable/bundles aditional components to bom # add cable/bundles aditional components to bom
bom_entries.extend(get_additional_component_bom(cable)) bom_entries.extend(get_additional_component_bom(cable))
for item in harness.additional_bom_items: # TODO: Simplify this by renaming the 'item' key to 'description' in all BOMEntry dicts.
bom_entries.append({ bom_entries.extend([{k.replace('description', 'item'): v for k, v in entry.items()} for entry in harness.additional_bom_items])
'item': item.get('description', ''), 'qty': item.get('qty', 1), 'unit': item.get('unit'), 'designators': item.get('designators'),
'manufacturer': item.get('manufacturer'), 'mpn': item.get('mpn'), 'pn': item.get('pn')
})
# remove line breaks if present and cleanup any resulting whitespace issues # remove line breaks if present and cleanup any resulting whitespace issues
bom_entries = [{k: clean_whitespace(v) for k, v in entry.items()} for entry in bom_entries] bom_entries = [{k: clean_whitespace(v) for k, v in entry.items()} for entry in bom_entries]
@ -110,7 +107,7 @@ def generate_bom(harness: "Harness") -> List[BOMEntry]:
for _, group in groupby(sorted(bom_entries, key=bom_types_group), key=bom_types_group): for _, group in groupby(sorted(bom_entries, key=bom_types_group), key=bom_types_group):
group_entries = list(group) group_entries = list(group)
designators = sum((make_list(entry.get('designators')) for entry in group_entries), []) designators = sum((make_list(entry.get('designators')) for entry in group_entries), [])
total_qty = sum(entry['qty'] for entry in group_entries) total_qty = sum(entry.get('qty', 1) for entry in group_entries)
bom.append({**group_entries[0], 'qty': round(total_qty, 3), 'designators': sorted(set(designators))}) bom.append({**group_entries[0], 'qty': round(total_qty, 3), 'designators': sorted(set(designators))})
# add an incrementing id to each bom item # add an incrementing id to each bom item