mirror of
https://github.com/inventree/InvenTree.git
synced 2025-06-14 19:15:41 +00:00
Removed UUID field from StockItem
- QR code is now created based on a JSON object - This will make it extensible to other things such as StockLocation - Created a helper function to make Barcode objects
This commit is contained in:
@ -272,7 +272,6 @@ class StockList(generics.ListCreateAPIView):
|
||||
|
||||
filter_fields = [
|
||||
'part',
|
||||
'uuid',
|
||||
'supplier_part',
|
||||
'customer',
|
||||
'belongs_to',
|
||||
|
17
InvenTree/stock/migrations/0013_remove_stockitem_uuid.py
Normal file
17
InvenTree/stock/migrations/0013_remove_stockitem_uuid.py
Normal file
@ -0,0 +1,17 @@
|
||||
# Generated by Django 2.2 on 2019-05-02 10:39
|
||||
|
||||
from django.db import migrations
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('stock', '0012_auto_20190502_0058'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.RemoveField(
|
||||
model_name='stockitem',
|
||||
name='uuid',
|
||||
),
|
||||
]
|
@ -17,7 +17,7 @@ from django.db.models.signals import pre_delete
|
||||
from django.dispatch import receiver
|
||||
|
||||
from datetime import datetime
|
||||
import uuid
|
||||
from InvenTree import helpers
|
||||
|
||||
from InvenTree.models import InvenTreeTree
|
||||
|
||||
@ -126,8 +126,22 @@ class StockItem(models.Model):
|
||||
('part', 'serial'),
|
||||
]
|
||||
|
||||
# UUID for generating QR codes
|
||||
uuid = models.UUIDField(default=uuid.uuid4, blank=True, editable=False, help_text='Unique ID for the StockItem')
|
||||
@property
|
||||
def format_barcode(self):
|
||||
""" Return a JSON string for formatting a barcode for this StockItem.
|
||||
Can be used to perform lookup of a stockitem using barcode
|
||||
|
||||
Contains the following data:
|
||||
|
||||
{ type: 'StockItem', stock_id: <pk>, part_id: <part_pk> }
|
||||
|
||||
Any other data should be looked up using the InvenTree API (as it may change)
|
||||
"""
|
||||
|
||||
return helpers.MakeBarcode('StockItem', {
|
||||
'stock_id': self.id,
|
||||
'part_id': self.part.id
|
||||
})
|
||||
|
||||
# The 'master' copy of the part of which this stock item is an instance
|
||||
part = models.ForeignKey('part.Part', on_delete=models.CASCADE, related_name='locations', help_text='Base part')
|
||||
|
@ -38,7 +38,6 @@ class StockItemSerializerBrief(serializers.ModelSerializer):
|
||||
model = StockItem
|
||||
fields = [
|
||||
'pk',
|
||||
'uuid',
|
||||
'part',
|
||||
'part_name',
|
||||
'supplier_part',
|
||||
@ -65,7 +64,6 @@ class StockItemSerializer(serializers.ModelSerializer):
|
||||
model = StockItem
|
||||
fields = [
|
||||
'pk',
|
||||
'uuid',
|
||||
'url',
|
||||
'part',
|
||||
'supplier_part',
|
||||
|
@ -39,10 +39,6 @@
|
||||
<td>Part</td>
|
||||
<td><a href="{% url 'part-stock' item.part.id %}">{{ item.part.name }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>UUID</td>
|
||||
<td>{{ item.uuid }}</td>
|
||||
</tr>
|
||||
{% if item.belongs_to %}
|
||||
<tr>
|
||||
<td>Belongs To</td>
|
||||
@ -114,7 +110,7 @@
|
||||
</table>
|
||||
</div>
|
||||
<div class='col-sm-6'>
|
||||
{% qr_from_text item.uuid size="s" image_format="png" error_correction="L" %}
|
||||
{% qr_from_text item.format_barcode size="s" image_format="png" error_correction="L" %}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
Reference in New Issue
Block a user