inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-04-30 04:26:44 +00:00
Code

Merge pull request #2704 from SchrodingersGat/bom-tree

Browse Source 
Re-enable display of multi-level BOM
This commit is contained in:
Oliver 2022-03-03 08:46:27 +11:00 committed by GitHub
commit 7e007d096a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 40 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
InvenTree/templates/js/translated/bom.js
View File

@ -671,9 +671,7 @@ function loadBomTable(table, options={}) {
// Do we show part pricing in the BOM table? // Do we show part pricing in the BOM table?
var show_pricing = global_settings.PART_SHOW_PRICE_IN_BOM; var show_pricing = global_settings.PART_SHOW_PRICE_IN_BOM;
if (!show_pricing) { params.include_pricing = show_pricing == true;
params.include_pricing = false;
}
if (options.part_detail) { if (options.part_detail) {
params.part_detail = true; params.part_detail = true;
@ -989,32 +987,40 @@ function loadBomTable(table, options={}) {
// Function to request BOM data for sub-items // Function to request BOM data for sub-items
// This function may be called recursively for multi-level BOMs // This function may be called recursively for multi-level BOMs
function requestSubItems(bom_pk, part_pk) { function requestSubItems(bom_pk, part_pk, depth=0) {
// TODO: 2022-02-03 Currently, multi-level BOMs are not actually displayed. // Prevent multi-level recursion
const MAX_BOM_DEPTH = 25;
// Re-enable this function once multi-level display has been re-deployed if (depth >= MAX_BOM_DEPTH) {
console.log(`Maximum BOM depth (${MAX_BOM_DEPTH}) reached!`);
return; return;
}
inventreeGet( inventreeGet(
options.bom_url, options.bom_url,
{ {
part: part_pk, part: part_pk,
sub_part_detail: true, sub_part_detail: true,
include_pricing: show_pricing == true,
}, },
{ {
success: function(response) { success: function(response) {
// Add the returned sub-items to the table
for (var idx = 0; idx < response.length; idx++) { for (var idx = 0; idx < response.length; idx++) {
response[idx].parentId = bom_pk; response[idx].parentId = bom_pk;
if (response[idx].sub_part_detail.assembly) {
requestSubItems(response[idx].pk, response[idx].sub_part);
}
} }
table.bootstrapTable('append', response); table.bootstrapTable('append', response);
// Next, re-iterate and check if the new items also have sub items
response.forEach(function(bom_item) {
if (bom_item.sub_part_detail.assembly) {
requestSubItems(bom_item.pk, bom_item.sub_part, depth + 1);
}
});
table.treegrid('collapseAll'); table.treegrid('collapseAll');
}, },
error: function(xhr) { error: function(xhr) {
@ -1026,7 +1032,7 @@ function loadBomTable(table, options={}) {
} }
table.inventreeTable({ table.inventreeTable({
treeEnable: !options.editable, treeEnable: true,
rootParentId: parent_id, rootParentId: parent_id,
idField: 'pk', idField: 'pk',
uniqueId: 'pk', uniqueId: 'pk',
@ -1066,19 +1072,19 @@ function loadBomTable(table, options={}) {
url: options.bom_url, url: options.bom_url,
onPostBody: function() { onPostBody: function() {
if (!options.editable) {
table.treegrid({ table.treegrid({
treeColumn: 0, treeColumn: 1,
onExpand: function() { onExpand: function() {
} }
}); });
}
table.treegrid('collapseAll');
}, },
onLoadSuccess: function() { onLoadSuccess: function() {
if (options.editable) { if (options.editable) {
table.bootstrapTable('uncheckAll'); table.bootstrapTable('uncheckAll');
} else { }
var data = table.bootstrapTable('getData'); var data = table.bootstrapTable('getData');
@ -1099,7 +1105,6 @@ function loadBomTable(table, options={}) {
requestSubItems(row.pk, row.sub_part); requestSubItems(row.pk, row.sub_part);
} }
} }
}
}, },
}); });