mirror of
https://github.com/inventree/InvenTree
synced 2024-08-30 18:33:04 +00:00
Adds javascript function to merge multiple stock items together
This commit is contained in:
Oliver
parent
31dbb9563b
commit
552ca8e5c4
@ -52,6 +52,7 @@
|
||||
loadStockTestResultsTable,
|
||||
loadStockTrackingTable,
|
||||
loadTableFilters,
|
||||
mergeStockItems,
|
||||
removeStockRow,
|
||||
serializeStockItem,
|
||||
stockItemFields,
|
||||
@ -595,17 +596,17 @@ function assignStockToCustomer(items, options={}) {
|
||||
buttons += '</div>';
|
||||
|
||||
html += `
|
||||
<tr id='stock_item_${pk}' class='stock-item'row'>
|
||||
<td id='part_${pk}'>${thumbnail} ${part.full_name}</td>
|
||||
<td id='stock_${pk}'>
|
||||
<div id='div_id_items_item_${pk}'>
|
||||
${quantity}
|
||||
<div id='errors-items_item_${pk}'></div>
|
||||
</div>
|
||||
</td>
|
||||
<td id='location_${pk}'>${location}</td>
|
||||
<td id='buttons_${pk}'>${buttons}</td>
|
||||
</tr>
|
||||
<tr id='stock_item_${pk}' class='stock-item-row'>
|
||||
<td id='part_${pk}'>${thumbnail} ${part.full_name}</td>
|
||||
<td id='stock_${pk}'>
|
||||
<div id='div_id_items_item_${pk}'>
|
||||
${quantity}
|
||||
<div id='errors-items_item_${pk}'></div>
|
||||
</div>
|
||||
</td>
|
||||
<td id='location_${pk}'>${location}</td>
|
||||
<td id='buttons_${pk}'>${buttons}</td>
|
||||
</tr>
|
||||
`;
|
||||
}
|
||||
|
||||
@ -615,13 +616,13 @@ function assignStockToCustomer(items, options={}) {
|
||||
method: 'POST',
|
||||
preFormContent: html,
|
||||
fields: {
|
||||
'customer': {
|
||||
customer: {
|
||||
value: options.customer,
|
||||
filters: {
|
||||
is_customer: true,
|
||||
},
|
||||
},
|
||||
'notes': {},
|
||||
notes: {},
|
||||
},
|
||||
confirm: true,
|
||||
confirmMessage: '{% trans "Confirm stock assignment" %}',
|
||||
@ -694,6 +695,184 @@ function assignStockToCustomer(items, options={}) {
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Merge multiple stock items together
|
||||
*/
|
||||
function mergeStockItems(items, options={}) {
|
||||
|
||||
// Generate HTML content for the form
|
||||
var html = `
|
||||
<div class='alert alert-block alert-danger'>
|
||||
<h5>{% trans "Warning: Merge operation cannot be reversed" %}</h5>
|
||||
<strong>{% trans "Some information will be lost when merging stock items" %}:</strong>
|
||||
<ul>
|
||||
<li>{% trans "Stock transaction history will be deleted for merged items" %}</li>
|
||||
<li>{% trans "Supplier part information will be deleted for merged items" %}</li>
|
||||
</ul>
|
||||
</div>
|
||||
`;
|
||||
|
||||
html += `
|
||||
<table class='table table-striped table-condensed' id='stock-merge-table'>
|
||||
<thead>
|
||||
<tr>
|
||||
<th>{% trans "Part" %}</th>
|
||||
<th>{% trans "Stock Item" %}</th>
|
||||
<th>{% trans "Location" %}</th>
|
||||
<th></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
`;
|
||||
|
||||
// Keep track of how many "locations" there are
|
||||
var locations = [];
|
||||
|
||||
for (var idx = 0; idx < items.length; idx++) {
|
||||
var item = items[idx];
|
||||
|
||||
var pk = item.pk;
|
||||
|
||||
if (item.location && !locations.includes(item.location)) {
|
||||
locations.push(item.location);
|
||||
}
|
||||
|
||||
var part = item.part_detail;
|
||||
var location = locationDetail(item, false);
|
||||
|
||||
var thumbnail = thumbnailImage(part.thumbnail || part.image);
|
||||
|
||||
var quantity = '';
|
||||
|
||||
if (item.serial && item.quantity == 1) {
|
||||
quantity = `{% trans "Serial" %}: ${item.serial}`;
|
||||
} else {
|
||||
quantity = `{% trans "Quantity" %}: ${item.quantity}`;
|
||||
}
|
||||
|
||||
quantity += stockStatusDisplay(item.status, {classes: 'float-right'});
|
||||
|
||||
var buttons = `<div class='btn-group' role='group'>`;
|
||||
|
||||
buttons += makeIconButton(
|
||||
'fa-times icon-red',
|
||||
'button-stock-item-remove',
|
||||
pk,
|
||||
'{% trans "Remove row" %}',
|
||||
);
|
||||
|
||||
html += `
|
||||
<tr id='stock_item_${pk}' class='stock-item-row'>
|
||||
<td id='part_${pk}'>${thumbnail} ${part.full_name}</td>
|
||||
<td id='stock_${pk}'>
|
||||
<div id='div_id_items_item_${pk}'>
|
||||
${quantity}
|
||||
<div id='errors-items_item_${pk}'></div>
|
||||
</div>
|
||||
</td>
|
||||
<td id='location_${pk}'>${location}</td>
|
||||
<td id='buttons_${pk}'>${buttons}</td>
|
||||
</tr>
|
||||
`;
|
||||
}
|
||||
|
||||
html += '</tbody></table>';
|
||||
|
||||
var location = locations.length == 1 ? locations[0] : null;
|
||||
|
||||
constructForm('{% url "api-stock-merge" %}', {
|
||||
method: 'POST',
|
||||
preFormContent: html,
|
||||
fields: {
|
||||
location: {
|
||||
value: location,
|
||||
icon: 'fa-sitemap',
|
||||
},
|
||||
notes: {},
|
||||
allow_mismatched_suppliers: {},
|
||||
allow_mismatched_status: {},
|
||||
},
|
||||
confirm: true,
|
||||
confirmMessage: '{% trans "Confirm stock item merge" %}',
|
||||
title: '{% trans "Merge Stock Items" %}',
|
||||
afterRender: function(fields, opts) {
|
||||
// Add button callbacks to remove rows
|
||||
$(opts.modal).find('.button-stock-item-remove').click(function() {
|
||||
var pk = $(this).attr('pk');
|
||||
|
||||
$(opts.modal).find(`#stock_item_${pk}`).remove();
|
||||
});
|
||||
},
|
||||
onSubmit: function(fields, opts) {
|
||||
|
||||
// Extract data elements from the form
|
||||
var data = {
|
||||
items: [],
|
||||
};
|
||||
|
||||
var item_pk_values = [];
|
||||
|
||||
items.forEach(function(item) {
|
||||
var pk = item.pk;
|
||||
|
||||
// Does the row still exist in the form?
|
||||
var row = $(opts.modal).find(`#stock_item_${pk}`);
|
||||
|
||||
if (row.exists()) {
|
||||
item_pk_values.push(pk);
|
||||
|
||||
data.items.push({
|
||||
item: pk,
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
var extra_fields = [
|
||||
'location',
|
||||
'notes',
|
||||
'allow_mismatched_suppliers',
|
||||
'allow_mismatched_status',
|
||||
];
|
||||
|
||||
extra_fields.forEach(function(field) {
|
||||
data[field] = getFormFieldValue(field, fields[field], opts);
|
||||
});
|
||||
|
||||
opts.nested = {
|
||||
'items': item_pk_values
|
||||
};
|
||||
|
||||
// Submit the form data
|
||||
inventreePut(
|
||||
'{% url "api-stock-merge" %}',
|
||||
data,
|
||||
{
|
||||
method: 'POST',
|
||||
success: function(response) {
|
||||
$(opts.modal).modal('hide');
|
||||
|
||||
if (options.success) {
|
||||
options.success(response);
|
||||
}
|
||||
},
|
||||
error: function(xhr) {
|
||||
switch (xhr.status) {
|
||||
case 400:
|
||||
handleFormErrors(xhr.responseJSON, fields, opts);
|
||||
break;
|
||||
default:
|
||||
$(opts.modal).modal('hide');
|
||||
showApiError(xhr, opts.url);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
)
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Perform stock adjustments
|
||||
*/
|
||||
@ -1875,6 +2054,20 @@ function loadStockTable(table, options) {
|
||||
stockAdjustment('move');
|
||||
});
|
||||
|
||||
$('#multi-item-merge').click(function() {
|
||||
var items = $(table).bootstrapTable('getSelections');
|
||||
|
||||
mergeStockItems(items, {
|
||||
success: function(response) {
|
||||
$(table).bootstrapTable('refresh');
|
||||
|
||||
showMessage('{% trans "Merged stock items" %}', {
|
||||
style: 'success',
|
||||
});
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
$('#multi-item-assign').click(function() {
|
||||
|
||||
var items = $(table).bootstrapTable('getSelections');
|
||||
|
||||
@ -49,6 +49,7 @@
|
||||
<li><a class='dropdown-item' href="#" id='multi-item-remove' title='{% trans "Remove from selected stock items" %}'><span class='fas fa-minus-circle'></span> {% trans "Remove stock" %}</a></li>
|
||||
<li><a class='dropdown-item' href="#" id='multi-item-stocktake' title='{% trans "Stocktake selected stock items" %}'><span class='fas fa-check-circle'></span> {% trans "Count stock" %}</a></li>
|
||||
<li><a class='dropdown-item' href='#' id='multi-item-move' title='{% trans "Move selected stock items" %}'><span class='fas fa-exchange-alt'></span> {% trans "Move stock" %}</a></li>
|
||||
<li><a class='dropdown-item' href='#' id='multi-item-merge' title='{% trans "Merge selected stock items" %}'><span class='fas fa-object-group'></span> {% trans "Merge stock" %}</a></li>
|
||||
<li><a class='dropdown-item' href='#' id='multi-item-order' title='{% trans "Order selected items" %}'><span class='fas fa-shopping-cart'></span> {% trans "Order stock" %}</a></li>
|
||||
<li><a class='dropdown-item' href='#' id='multi-item-assign' title='{% trans "Assign to customer" %}'><span class='fas fa-user-tie'></span> {% trans "Assign to customer" %}</a></li>
|
||||
<li><a class='dropdown-item' href='#' id='multi-item-set-status' title='{% trans "Change status" %}'><span class='fas fa-exclamation-circle'></span> {% trans "Change stock status" %}</a></li>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user