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

Merge pull request #2448 from SchrodingersGat/build-allocation-fixes

Browse Source 
Correctly allow "inherited" BOM items to be allocated to a build order
This commit is contained in:
Oliver 2021-12-11 08:10:26 +11:00 committed by GitHub
commit c35971c524
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
InvenTree/build/models.py
View File

@ -1150,7 +1150,7 @@ class BuildItem(models.Model):
bom_item_valid = False bom_item_valid = False
if self.bom_item: if self.bom_item and self.build:
""" """
A BomItem object has already been assigned. This is valid if: A BomItem object has already been assigned. This is valid if:
@ -1162,10 +1162,13 @@ class BuildItem(models.Model):
iii) The Part referenced by the StockItem is a valid substitute for the BomItem iii) The Part referenced by the StockItem is a valid substitute for the BomItem
""" """
if self.build and self.build.part == self.bom_item.part: if self.build.part == self.bom_item.part:
bom_item_valid = self.bom_item.is_stock_item_valid(self.stock_item) bom_item_valid = self.bom_item.is_stock_item_valid(self.stock_item)
elif self.bom_item.inherited:
if self.build.part in self.bom_item.part.get_descendants(include_self=False):
bom_item_valid = self.bom_item.is_stock_item_valid(self.stock_item)
# If the existing BomItem is *not* valid, try to find a match # If the existing BomItem is *not* valid, try to find a match
if not bom_item_valid: if not bom_item_valid:

14
InvenTree/build/serializers.py
View File

@ -309,14 +309,20 @@ class BuildAllocationItemSerializer(serializers.Serializer):
) )
def validate_bom_item(self, bom_item): def validate_bom_item(self, bom_item):
"""
# TODO: Fix this validation - allow for variants and substitutes! Check if the parts match!
"""
build = self.context['build'] build = self.context['build']
# BomItem must point to the same 'part' as the parent build # BomItem should point to the same 'part' as the parent build
if build.part != bom_item.part: if build.part != bom_item.part:
raise ValidationError(_("bom_item.part must point to the same part as the build order"))
# If not, it may be marked as "inherited" from a parent part
if bom_item.inherited and build.part in bom_item.part.get_descendants(include_self=False):
pass
else:
raise ValidationError(_("bom_item.part must point to the same part as the build order"))
return bom_item return bom_item

10
InvenTree/build/templates/build/build_base.html
View File

@ -77,6 +77,11 @@ src="{% static 'img/blank_image.png' %}"
<td>{% trans "Part" %}</td> <td>{% trans "Part" %}</td>
<td><a href="{% url 'part-detail' build.part.id %}?display=build-orders">{{ build.part.full_name }}</a></td> <td><a href="{% url 'part-detail' build.part.id %}?display=build-orders">{{ build.part.full_name }}</a></td>
</tr> </tr>
<tr>
<td></td>
<td>{% trans "Quantity" %}</td>
<td>{{ build.quantity }}</td>
</tr>
<tr> <tr>
<td><span class='fas fa-info-circle'></span></td> <td><span class='fas fa-info-circle'></span></td>
<td>{% trans "Build Description" %}</td> <td>{% trans "Build Description" %}</td>
@ -127,11 +132,6 @@ src="{% static 'img/blank_image.png' %}"
{% block details_right %} {% block details_right %}
<table class='table table-striped table-condensed'> <table class='table table-striped table-condensed'>
<col width='25'> <col width='25'>
<tr>
<td></td>
<td>{% trans "Quantity" %}</td>
<td>{{ build.quantity }}</td>
</tr>
<tr> <tr>
<td><span class='fas fa-info'></span></td> <td><span class='fas fa-info'></span></td>
<td>{% trans "Status" %}</td> <td>{% trans "Status" %}</td>