From 0322301d966f5b2b70d33c9c514524a23bb2323f Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 28 Jan 2022 15:39:38 +0800
Subject: [PATCH] =?UTF-8?q?puorderitem=E5=A2=9E=E5=8A=A0list=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hb_server/apps/inm/services.py | 6 ++++--
 hb_server/apps/pum/views.py    | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

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):
     """
     采购订单条目
     """