diff --git a/apps/wpm/serializers.py b/apps/wpm/serializers.py index 375739d4..4b9865e3 100644 --- a/apps/wpm/serializers.py +++ b/apps/wpm/serializers.py @@ -333,6 +333,8 @@ class GenHandoverSerializer(serializers.Serializer): class GenHandoverWmSerializer(serializers.Serializer): wm = serializers.PrimaryKeyRelatedField( label='车间物料ID', queryset=WMaterial.objects.all()) + send_mgroup = serializers.PrimaryKeyRelatedField( + label='送料工段ID', queryset=Mgroup.objects.all()) recive_dept = serializers.PrimaryKeyRelatedField( label='交送车间', queryset=Dept.objects.all()) recive_user = serializers.PrimaryKeyRelatedField( diff --git a/apps/wpm/views.py b/apps/wpm/views.py index 4dbe0a50..0fc2e825 100644 --- a/apps/wpm/views.py +++ b/apps/wpm/views.py @@ -285,13 +285,16 @@ class HandoverViewSet(CustomModelViewSet): sr.is_valid(raise_exception=True) vdata = sr.validated_data user = request.user - send_date, send_user, recive_dept, recive_user, wm, count = vdata['send_date'], vdata[ + send_date, send_mgroup, send_user, recive_dept, recive_user, wm, count = vdata['send_date'], vdata['send_mgroup'], vdata[ 'send_user'], vdata['recive_dept'], vdata['recive_user'], vdata['wm'], vdata['count'] + if send_mgroup.belong_dept != wm.belong_dept: + raise ParseError('送料工段错误!') handover = Handover.objects.create( send_date=send_date, send_user=send_user, recive_dept=recive_dept, recive_user=recive_user, + send_mgroup=send_mgroup, send_dept=wm.belong_dept, batch=wm.batch, material=wm.material,