Mirrored_Repos/InvenTree
1
0
Fork 0
mirror of https://github.com/inventree/InvenTree synced 2024-08-30 18:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Extract serial numbers from submitted form data

Browse Source
This commit is contained in:
Oliver 2022-02-15 13:19:41 +11:00
parent 037232c177
commit 24c13b04b6
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
InvenTree/build/serializers.py
View File

@ -245,9 +245,10 @@ class BuildOutputCreateSerializer(serializers.Serializer):
Perform form validation Perform form validation
""" """
build = self.get_build()
part = self.get_part() part = self.get_part()
serials = None
# Cache a list of serial numbers (to be used in the "save" method)
self.serials = None
quantity = data['quantity'] quantity = data['quantity']
serial_numbers = data.get('serial_numbers', '') serial_numbers = data.get('serial_numbers', '')
@ -255,7 +256,7 @@ class BuildOutputCreateSerializer(serializers.Serializer):
if serial_numbers: if serial_numbers:
try: try:
serials = extract_serial_numbers(serial_numbers, quantity, part.getLatestSerialNumberInt()) self.serials = extract_serial_numbers(serial_numbers, quantity, part.getLatestSerialNumberInt())
except DjangoValidationError as e: except DjangoValidationError as e:
raise ValidationError({ raise ValidationError({
'serial_numbers': e.messages, 'serial_numbers': e.messages,
@ -264,7 +265,7 @@ class BuildOutputCreateSerializer(serializers.Serializer):
# Check for conflicting serial numbesr # Check for conflicting serial numbesr
existing = [] existing = []
for serial in serials: for serial in self.serials:
if part.checkIfSerialNumberExists(serial): if part.checkIfSerialNumberExists(serial):
existing.append(serial) existing.append(serial)

15
InvenTree/templates/js/translated/build.js
View File

@ -205,6 +205,18 @@ function createBuildOutput(build_id, options) {
auto_allocate: {}, auto_allocate: {},
}; };
// Work out the next available serial numbers
inventreeGet(`/api/part/${build.part}/serial-numbers/`, {}, {
success: function(data) {
if (data.next) {
fields.serial_numbers.placeholder = `{% trans "Next available serial number" %}: ${data.next}`;
} else {
fields.serial_numbers.placeholder = `{% trans "Latest serial number" %}: ${data.latest}`;
}
},
async: false,
});
if (options.trackable_parts) { if (options.trackable_parts) {
html += ` html += `
<div class='alert alert-block alert-info'> <div class='alert alert-block alert-info'>
@ -229,6 +241,9 @@ function createBuildOutput(build_id, options) {
confirm: true, confirm: true,
fields: fields, fields: fields,
preFormContent: html, preFormContent: html,
onSuccess: function(response) {
location.reload();
},
}); });
} }