mirror of
https://github.com/inventree/InvenTree
synced 2024-08-30 18:33:04 +00:00
Merge pull request #2245 from SchrodingersGat/bom-export-fix
Refactored bom export
This commit is contained in:
Oliver
GitHub
commit
5cd2a14314
@ -160,171 +160,108 @@ def ExportBom(part, fmt='csv', cascade=False, max_levels=None, parameter_data=Fa
|
|||||||
# Add stock columns to dataset
|
# Add stock columns to dataset
|
||||||
add_columns_to_dataset(stock_cols, len(bom_items))
|
add_columns_to_dataset(stock_cols, len(bom_items))
|
||||||
|
|
||||||
if manufacturer_data and supplier_data:
|
if manufacturer_data or supplier_data:
|
||||||
"""
|
"""
|
||||||
If requested, add extra columns for each SupplierPart and ManufacturerPart associated with each line item
|
If requested, add extra columns for each SupplierPart and ManufacturerPart associated with each line item
|
||||||
"""
|
"""
|
||||||
|
|
||||||
# Expand dataset with manufacturer parts
|
# Keep track of the supplier parts we have already exported
|
||||||
manufacturer_headers = [
|
supplier_parts_used = set()
|
||||||
_('Manufacturer'),
|
|
||||||
_('MPN'),
|
|
||||||
]
|
|
||||||
|
|
||||||
supplier_headers = [
|
|
||||||
_('Supplier'),
|
|
||||||
_('SKU'),
|
|
||||||
]
|
|
||||||
|
|
||||||
manufacturer_cols = {}
|
manufacturer_cols = {}
|
||||||
|
|
||||||
for b_idx, bom_item in enumerate(bom_items):
|
for bom_idx, bom_item in enumerate(bom_items):
|
||||||
# Get part instance
|
# Get part instance
|
||||||
b_part = bom_item.sub_part
|
b_part = bom_item.sub_part
|
||||||
|
|
||||||
|
# Include manufacturer data for each BOM item
|
||||||
|
if manufacturer_data:
|
||||||
|
|
||||||
# Filter manufacturer parts
|
# Filter manufacturer parts
|
||||||
manufacturer_parts = ManufacturerPart.objects.filter(part__pk=b_part.pk)
|
manufacturer_parts = ManufacturerPart.objects.filter(part__pk=b_part.pk).prefetch_related('supplier_parts')
|
||||||
manufacturer_parts = manufacturer_parts.prefetch_related('supplier_parts')
|
|
||||||
|
|
||||||
# Process manufacturer part
|
for mp_idx, mp_part in enumerate(manufacturer_parts):
|
||||||
for manufacturer_idx, manufacturer_part in enumerate(manufacturer_parts):
|
|
||||||
|
|
||||||
if manufacturer_part and manufacturer_part.manufacturer:
|
# Extract the "name" field of the Manufacturer (Company)
|
||||||
manufacturer_name = manufacturer_part.manufacturer.name
|
if mp_part and mp_part.manufacturer:
|
||||||
|
manufacturer_name = mp_part.manufacturer.name
|
||||||
else:
|
else:
|
||||||
manufacturer_name = ''
|
manufacturer_name = ''
|
||||||
|
|
||||||
if manufacturer_part:
|
# Extract the "MPN" field from the Manufacturer Part
|
||||||
manufacturer_mpn = manufacturer_part.MPN
|
if mp_part:
|
||||||
|
manufacturer_mpn = mp_part.MPN
|
||||||
else:
|
else:
|
||||||
manufacturer_mpn = ''
|
manufacturer_mpn = ''
|
||||||
|
|
||||||
# Generate column names for this manufacturer
|
# Generate a column name for this manufacturer
|
||||||
k_man = manufacturer_headers[0] + "_" + str(manufacturer_idx)
|
k_man = f'{_("Manufacturer")}_{mp_idx}'
|
||||||
k_mpn = manufacturer_headers[1] + "_" + str(manufacturer_idx)
|
k_mpn = f'{_("MPN")}_{mp_idx}'
|
||||||
|
|
||||||
try:
|
try:
|
||||||
manufacturer_cols[k_man].update({b_idx: manufacturer_name})
|
manufacturer_cols[k_man].update({bom_idx: manufacturer_name})
|
||||||
manufacturer_cols[k_mpn].update({b_idx: manufacturer_mpn})
|
manufacturer_cols[k_mpn].update({bom_idx: manufacturer_mpn})
|
||||||
except KeyError:
|
except KeyError:
|
||||||
manufacturer_cols[k_man] = {b_idx: manufacturer_name}
|
manufacturer_cols[k_man] = {bom_idx: manufacturer_name}
|
||||||
manufacturer_cols[k_mpn] = {b_idx: manufacturer_mpn}
|
manufacturer_cols[k_mpn] = {bom_idx: manufacturer_mpn}
|
||||||
|
|
||||||
# Process supplier parts
|
# We wish to include supplier data for this manufacturer part
|
||||||
for supplier_idx, supplier_part in enumerate(manufacturer_part.supplier_parts.all()):
|
if supplier_data:
|
||||||
|
|
||||||
if supplier_part.supplier and supplier_part.supplier:
|
for sp_idx, sp_part in enumerate(mp_part.supplier_parts.all()):
|
||||||
supplier_name = supplier_part.supplier.name
|
|
||||||
|
supplier_parts_used.add(sp_part)
|
||||||
|
|
||||||
|
if sp_part.supplier and sp_part.supplier:
|
||||||
|
supplier_name = sp_part.supplier.name
|
||||||
else:
|
else:
|
||||||
supplier_name = ''
|
supplier_name = ''
|
||||||
|
|
||||||
if supplier_part:
|
if sp_part:
|
||||||
supplier_sku = supplier_part.SKU
|
supplier_sku = sp_part.SKU
|
||||||
else:
|
else:
|
||||||
supplier_sku = ''
|
supplier_sku = ''
|
||||||
|
|
||||||
# Generate column names for this supplier
|
# Generate column names for this supplier
|
||||||
k_sup = str(supplier_headers[0]) + "_" + str(manufacturer_idx) + "_" + str(supplier_idx)
|
k_sup = str(_("Supplier")) + "_" + str(mp_idx) + "_" + str(sp_idx)
|
||||||
k_sku = str(supplier_headers[1]) + "_" + str(manufacturer_idx) + "_" + str(supplier_idx)
|
k_sku = str(_("SKU")) + "_" + str(mp_idx) + "_" + str(sp_idx)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
manufacturer_cols[k_sup].update({b_idx: supplier_name})
|
manufacturer_cols[k_sup].update({bom_idx: supplier_name})
|
||||||
manufacturer_cols[k_sku].update({b_idx: supplier_sku})
|
manufacturer_cols[k_sku].update({bom_idx: supplier_sku})
|
||||||
except KeyError:
|
except KeyError:
|
||||||
manufacturer_cols[k_sup] = {b_idx: supplier_name}
|
manufacturer_cols[k_sup] = {bom_idx: supplier_name}
|
||||||
manufacturer_cols[k_sku] = {b_idx: supplier_sku}
|
manufacturer_cols[k_sku] = {bom_idx: supplier_sku}
|
||||||
|
|
||||||
# Add manufacturer columns to dataset
|
if supplier_data:
|
||||||
add_columns_to_dataset(manufacturer_cols, len(bom_items))
|
# Add in any extra supplier parts, which are not associated with a manufacturer part
|
||||||
|
|
||||||
elif manufacturer_data:
|
for sp_idx, sp_part in enumerate(SupplierPart.objects.filter(part__pk=b_part.pk)):
|
||||||
"""
|
|
||||||
If requested, add extra columns for each ManufacturerPart associated with each line item
|
|
||||||
"""
|
|
||||||
|
|
||||||
# Expand dataset with manufacturer parts
|
if sp_part in supplier_parts_used:
|
||||||
manufacturer_headers = [
|
continue
|
||||||
_('Manufacturer'),
|
|
||||||
_('MPN'),
|
|
||||||
]
|
|
||||||
|
|
||||||
manufacturer_cols = {}
|
supplier_parts_used.add(sp_part)
|
||||||
|
|
||||||
for b_idx, bom_item in enumerate(bom_items):
|
if sp_part.supplier:
|
||||||
# Get part instance
|
supplier_name = sp_part.supplier.name
|
||||||
b_part = bom_item.sub_part
|
|
||||||
|
|
||||||
# Filter supplier parts
|
|
||||||
manufacturer_parts = ManufacturerPart.objects.filter(part__pk=b_part.pk)
|
|
||||||
|
|
||||||
for idx, manufacturer_part in enumerate(manufacturer_parts):
|
|
||||||
|
|
||||||
if manufacturer_part:
|
|
||||||
manufacturer_name = manufacturer_part.manufacturer.name
|
|
||||||
else:
|
|
||||||
manufacturer_name = ''
|
|
||||||
|
|
||||||
manufacturer_mpn = manufacturer_part.MPN
|
|
||||||
|
|
||||||
# Add manufacturer data to the manufacturer columns
|
|
||||||
|
|
||||||
# Generate column names for this manufacturer
|
|
||||||
k_man = manufacturer_headers[0] + "_" + str(idx)
|
|
||||||
k_mpn = manufacturer_headers[1] + "_" + str(idx)
|
|
||||||
|
|
||||||
try:
|
|
||||||
manufacturer_cols[k_man].update({b_idx: manufacturer_name})
|
|
||||||
manufacturer_cols[k_mpn].update({b_idx: manufacturer_mpn})
|
|
||||||
except KeyError:
|
|
||||||
manufacturer_cols[k_man] = {b_idx: manufacturer_name}
|
|
||||||
manufacturer_cols[k_mpn] = {b_idx: manufacturer_mpn}
|
|
||||||
|
|
||||||
# Add manufacturer columns to dataset
|
|
||||||
add_columns_to_dataset(manufacturer_cols, len(bom_items))
|
|
||||||
|
|
||||||
elif supplier_data:
|
|
||||||
"""
|
|
||||||
If requested, add extra columns for each SupplierPart associated with each line item
|
|
||||||
"""
|
|
||||||
|
|
||||||
# Expand dataset with manufacturer parts
|
|
||||||
manufacturer_headers = [
|
|
||||||
_('Supplier'),
|
|
||||||
_('SKU'),
|
|
||||||
]
|
|
||||||
|
|
||||||
manufacturer_cols = {}
|
|
||||||
|
|
||||||
for b_idx, bom_item in enumerate(bom_items):
|
|
||||||
# Get part instance
|
|
||||||
b_part = bom_item.sub_part
|
|
||||||
|
|
||||||
# Filter supplier parts
|
|
||||||
supplier_parts = SupplierPart.objects.filter(part__pk=b_part.pk)
|
|
||||||
|
|
||||||
for idx, supplier_part in enumerate(supplier_parts):
|
|
||||||
|
|
||||||
if supplier_part.supplier:
|
|
||||||
supplier_name = supplier_part.supplier.name
|
|
||||||
else:
|
else:
|
||||||
supplier_name = ''
|
supplier_name = ''
|
||||||
|
|
||||||
supplier_sku = supplier_part.SKU
|
supplier_sku = sp_part.SKU
|
||||||
|
|
||||||
# Add manufacturer data to the manufacturer columns
|
|
||||||
|
|
||||||
# Generate column names for this supplier
|
# Generate column names for this supplier
|
||||||
k_sup = manufacturer_headers[0] + "_" + str(idx)
|
k_sup = str(_("Supplier")) + "_" + str(sp_idx)
|
||||||
k_sku = manufacturer_headers[1] + "_" + str(idx)
|
k_sku = str(_("SKU")) + "_" + str(sp_idx)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
manufacturer_cols[k_sup].update({b_idx: supplier_name})
|
manufacturer_cols[k_sup].update({bom_idx: supplier_name})
|
||||||
manufacturer_cols[k_sku].update({b_idx: supplier_sku})
|
manufacturer_cols[k_sku].update({bom_idx: supplier_sku})
|
||||||
except KeyError:
|
except KeyError:
|
||||||
manufacturer_cols[k_sup] = {b_idx: supplier_name}
|
manufacturer_cols[k_sup] = {bom_idx: supplier_name}
|
||||||
manufacturer_cols[k_sku] = {b_idx: supplier_sku}
|
manufacturer_cols[k_sku] = {bom_idx: supplier_sku}
|
||||||
|
|
||||||
# Add manufacturer columns to dataset
|
# Add supplier columns to dataset
|
||||||
add_columns_to_dataset(manufacturer_cols, len(bom_items))
|
add_columns_to_dataset(manufacturer_cols, len(bom_items))
|
||||||
|
|
||||||
data = dataset.export(fmt)
|
data = dataset.export(fmt)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user