diff --git a/apps/wpm/migrations/0037_auto_20231130_1047.py b/apps/wpm/migrations/0037_auto_20231130_1047.py new file mode 100644 index 00000000..9fdad285 --- /dev/null +++ b/apps/wpm/migrations/0037_auto_20231130_1047.py @@ -0,0 +1,29 @@ +# Generated by Django 3.2.12 on 2023-11-30 02:47 + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('mtm', '0025_auto_20231120_1139'), + ('wpm', '0036_handover_send_mgroup'), + ] + + operations = [ + migrations.AlterField( + model_name='handover', + name='material', + field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to='mtm.material', verbose_name='物料'), + preserve_default=False, + ), + migrations.AlterField( + model_name='handover', + name='send_user', + field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, related_name='handover_send_user', to='system.user', verbose_name='交送人'), + preserve_default=False, + ), + ] diff --git a/apps/wpm/models.py b/apps/wpm/models.py index c250ace7..f16db38b 100644 --- a/apps/wpm/models.py +++ b/apps/wpm/models.py @@ -163,7 +163,7 @@ 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) + User, verbose_name='交送人', on_delete=models.CASCADE, related_name='handover_send_user') send_mgroup = models.ForeignKey( Mgroup, verbose_name='送料工段', on_delete=models.CASCADE, null=True, blank=True ) @@ -171,7 +171,7 @@ class Handover(CommonADModel): Dept, verbose_name='送料部门', on_delete=models.CASCADE, related_name='handover_send_dept') batch = models.CharField('批次号', max_length=50) material = models.ForeignKey( - Material, verbose_name='物料', on_delete=models.CASCADE, null=True, blank=True) + Material, verbose_name='物料', on_delete=models.CASCADE) count = models.PositiveIntegerField('送料数', default=0) count_eweight = models.FloatField('单数重量', default=0) recive_dept = models.ForeignKey( diff --git a/apps/wpm/serializers.py b/apps/wpm/serializers.py index 2a0e76bd..a79ad203 100644 --- a/apps/wpm/serializers.py +++ b/apps/wpm/serializers.py @@ -306,6 +306,11 @@ class HandoverSerializer(CustomModelSerializer): source='recive_user.name', read_only=True) material_ = MaterialSimpleSerializer(source='material', read_only=True) + def validate(self, attrs): + if attrs.get('mlog', None): + attrs['send_mgroup'] = attrs['mlog'].mgroup + return super().validate(attrs) + class Meta: model = Handover fields = '__all__'