zcdsj
/
hberp
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop

This commit is contained in:
shijing 2022-02-25 16:04:34 +08:00
parent b9f39f4239 ad85757504
commit dbe37339fb
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hb_server/apps/inm/serializers.py
View File

@ -192,7 +192,7 @@ class FIFOInPurSerializer(serializers.ModelSerializer):
def create(self, validated_data):
pu_order = validated_data['pu_order']
if pu_order.is_audited:
if not pu_order.is_audited:
raise ValidationError('该采购订单未审核')
validated_data['vendor'] = pu_order.vendor
validated_data['number'] = 'RK' + ranstr(7)

11
hb_server/apps/inm/services.py
View File

@ -25,10 +25,11 @@ class InmService:
iv, _= Inventory.objects.get_or_create(material=material, warehouse=warehouse, \
defaults={'material':material, 'warehouse':warehouse, 'count':0})
iv.count = MaterialBatch.objects.filter(material=material, warehouse=warehouse).count()
iv.count = MaterialBatch.objects.filter(material=material,
warehouse=warehouse).aggregate(total=Sum('count')).get('total', 0)
iv.save()
material.count = MaterialBatch.objects.filter(material=material).count()
material.count = MaterialBatch.objects.filter(material=material).aggregate(total=Sum('count')).get('total', 0)
material.save()
# 创建IProduct
@ -66,10 +67,12 @@ class InmService:
mb.save()
iv = Inventory.objects.get(material=material, warehouse=warehouse)
iv.count = MaterialBatch.objects.filter(material=material, warehouse=warehouse).count()
iv.count = MaterialBatch.objects.filter(material=material,
warehouse=warehouse).aggregate(total=Sum('count')).get('total', 0)
iv.save()
material.count = MaterialBatch.objects.filter(material=material).count()
material.count = MaterialBatch.objects.filter(material=
material).aggregate(total=Sum('count')).get('total', 0)
material.save()
# 删除IProduct