diff --git a/hb_server/apps/inm/filters.py b/hb_server/apps/inm/filters.py index e4f6409..377cb4d 100644 --- a/hb_server/apps/inm/filters.py +++ b/hb_server/apps/inm/filters.py @@ -29,4 +29,4 @@ class IProductFilterSet(DynamicFieldsFilterMixin, filters.FilterSet): class Meta: model = IProduct fields = ['material', 'warehouse', 'batch', 'order', 'material__type', 'update_time_start', 'update_time_end', - 'to_order', 'need_to_order'] + 'to_order', 'need_to_order', 'state'] diff --git a/hb_server/apps/inm/services.py b/hb_server/apps/inm/services.py index 847fa76..b9df308 100644 --- a/hb_server/apps/inm/services.py +++ b/hb_server/apps/inm/services.py @@ -1,8 +1,11 @@ +from itertools import count from rest_framework.exceptions import ValidationError from apps.inm.models import FIFOItemProduct, IProduct, Inventory, MaterialBatch, FIFO, FIFOItem, WareHouse from apps.mtm.models import Material from apps.sam.models import SalePack, SaleProduct from django.db.models import Count +from django.db.models.aggregates import Sum + class InmService: @classmethod def update_inm(cls, instance:FIFO, type:int=1): @@ -114,8 +117,12 @@ class InmService: ip['iproduct'] = i ipxs.append(FIFOItemProduct(**ip)) FIFOItemProduct.objects.bulk_create(ipxs) + # 装箱附件处理 - # SalePack.objects.filter(sale_product__in = saleps) + # ml = SalePack.objects.filter(sale_product__iproduct = ips + # ).values('packitem__material').annotate(count=Sum('count')) + # for i in ml: + # material = Material.objects.get(id=i['material']) # 更新动态产品表情况