diff --git a/hb_server/apps/inm/services.py b/hb_server/apps/inm/services.py index 59c8a0f..d227e62 100644 --- a/hb_server/apps/inm/services.py +++ b/hb_server/apps/inm/services.py @@ -39,8 +39,10 @@ class InmService: # 如果是采购入库更新采购订单表 if instance.type == FIFO.FIFO_TYPE_PUR_IN: pur_order_item = i.pur_order_item - pur_order_item.delivered_count = pur_order_item.delivered_count\ - + i.count + delivered_count = pur_order_item.delivered_count + i.count + if delivered_count > pur_order_item.count: + raise ValidationError('超出采购订单所需量') + pur_order_item.delivered_count = delivered_count pur_order_item.save() elif instance.type in [FIFO.FIFO_TYPE_DO_OUT, FIFO.FIFO_TYPE_SALE_OUT]: # 生产领料 销售出库 diff --git a/hb_server/apps/pum/views.py b/hb_server/apps/pum/views.py index 2ae32da..a90fdca 100644 --- a/hb_server/apps/pum/views.py +++ b/hb_server/apps/pum/views.py @@ -2,7 +2,7 @@ from django.shortcuts import render from numpy import delete from rest_framework.viewsets import ModelViewSet -from rest_framework.mixins import CreateModelMixin, DestroyModelMixin +from rest_framework.mixins import CreateModelMixin, DestroyModelMixin, ListModelMixin from rest_framework.viewsets import GenericViewSet from apps.pum.models import PuOrder, PuOrderItem, Vendor from apps.pum.serializers import PuOrderCreateUpdateSerializer, PuOrderItemCreateSerializer, PuOrderItemSerializer, PuOrderItemUpdateSerializer, PuOrderSerializer, VendorSerializer @@ -68,7 +68,7 @@ class PuOrderViewSet(CreateUpdateModelAMixin, ModelViewSet): return Response() return Response('订单状态有误', status=status.HTTP_400_BAD_REQUEST) -class PuOrderItemViewSet(CreateModelMixin, DestroyModelMixin, GenericViewSet): +class PuOrderItemViewSet(CreateModelMixin, ListModelMixin, DestroyModelMixin, GenericViewSet): """ 采购订单条目 """