diff --git a/apps/wpm/filters.py b/apps/wpm/filters.py index 808249f9..3db2843b 100644 --- a/apps/wpm/filters.py +++ b/apps/wpm/filters.py @@ -70,5 +70,7 @@ class HandoverFilter(filters.FilterSet): "recive_dept__name": ["exact"], "send_date": ["exact"], "material__type": ["exact", "in"], - "submit_time": ["isnull"] + "submit_time": ["isnull"], + "mlog": ["isnull"], + "send_mgroup": ["exact"] } diff --git a/apps/wpm/migrations/0036_handover_send_mgroup.py b/apps/wpm/migrations/0036_handover_send_mgroup.py new file mode 100644 index 00000000..6a1d51a3 --- /dev/null +++ b/apps/wpm/migrations/0036_handover_send_mgroup.py @@ -0,0 +1,20 @@ +# Generated by Django 3.2.12 on 2023-11-29 08:51 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('mtm', '0025_auto_20231120_1139'), + ('wpm', '0035_otherlog'), + ] + + operations = [ + migrations.AddField( + model_name='handover', + name='send_mgroup', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='mtm.mgroup', verbose_name='送料工段'), + ), + ] diff --git a/apps/wpm/models.py b/apps/wpm/models.py index 42c14bc6..c250ace7 100644 --- a/apps/wpm/models.py +++ b/apps/wpm/models.py @@ -164,6 +164,9 @@ class Handover(CommonADModel): send_date = models.DateField('送料日期') send_user = models.ForeignKey( User, verbose_name='交送人', on_delete=models.CASCADE, related_name='handover_send_user', null=True, blank=True) + send_mgroup = models.ForeignKey( + Mgroup, verbose_name='送料工段', on_delete=models.CASCADE, null=True, blank=True + ) send_dept = models.ForeignKey( Dept, verbose_name='送料部门', on_delete=models.CASCADE, related_name='handover_send_dept') batch = models.CharField('批次号', max_length=50) diff --git a/apps/wpm/serializers.py b/apps/wpm/serializers.py index 6e51b876..2a0e76bd 100644 --- a/apps/wpm/serializers.py +++ b/apps/wpm/serializers.py @@ -298,7 +298,8 @@ class DeptBatchSerializer(serializers.Serializer): class HandoverSerializer(CustomModelSerializer): - material = serializers.PrimaryKeyRelatedField(required=True, label='物料ID', queryset=Material.objects.all()) + material = serializers.PrimaryKeyRelatedField( + required=True, label='物料ID', queryset=Material.objects.all()) send_user_name = serializers.CharField( source='send_user.name', read_only=True) recive_user_name = serializers.CharField( diff --git a/apps/wpm/views.py b/apps/wpm/views.py index 094781ff..c059bb1d 100644 --- a/apps/wpm/views.py +++ b/apps/wpm/views.py @@ -283,7 +283,7 @@ class HandoverViewSet(CustomModelViewSet): @action(methods=['post'], detail=False, perms_map={'post': 'handover.create'}, serializer_class=GenHandoverSerializer) @transaction.atomic - def gen_by_mlogs(self, request): + def gen_by_mlog(self, request): """从生产日志生成交接记录 从生产日志生成交接记录 @@ -306,6 +306,7 @@ class HandoverViewSet(CustomModelViewSet): count=mlog.count_real, count_eweight=mlog.count_real_eweight, mlog=mlog, + mgroup=mlog.mgroup, create_by=user ) return Response()