fix: gen_by_wm需提供send_mgroup

This commit is contained in:
caoqianming 2023-12-16 11:42:38 +08:00
parent 19a53931c4
commit bd6b4a5f82
2 changed files with 6 additions and 1 deletions

View File

@ -333,6 +333,8 @@ class GenHandoverSerializer(serializers.Serializer):
class GenHandoverWmSerializer(serializers.Serializer): class GenHandoverWmSerializer(serializers.Serializer):
wm = serializers.PrimaryKeyRelatedField( wm = serializers.PrimaryKeyRelatedField(
label='车间物料ID', queryset=WMaterial.objects.all()) label='车间物料ID', queryset=WMaterial.objects.all())
send_mgroup = serializers.PrimaryKeyRelatedField(
label='送料工段ID', queryset=Mgroup.objects.all())
recive_dept = serializers.PrimaryKeyRelatedField( recive_dept = serializers.PrimaryKeyRelatedField(
label='交送车间', queryset=Dept.objects.all()) label='交送车间', queryset=Dept.objects.all())
recive_user = serializers.PrimaryKeyRelatedField( recive_user = serializers.PrimaryKeyRelatedField(

View File

@ -285,13 +285,16 @@ class HandoverViewSet(CustomModelViewSet):
sr.is_valid(raise_exception=True) sr.is_valid(raise_exception=True)
vdata = sr.validated_data vdata = sr.validated_data
user = request.user 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'] '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( handover = Handover.objects.create(
send_date=send_date, send_date=send_date,
send_user=send_user, send_user=send_user,
recive_dept=recive_dept, recive_dept=recive_dept,
recive_user=recive_user, recive_user=recive_user,
send_mgroup=send_mgroup,
send_dept=wm.belong_dept, send_dept=wm.belong_dept,
batch=wm.batch, batch=wm.batch,
material=wm.material, material=wm.material,