diff --git a/apps/wpm/migrations/0093_alter_handover_recive_user.py b/apps/wpm/migrations/0093_alter_handover_recive_user.py new file mode 100644 index 00000000..25e4b100 --- /dev/null +++ b/apps/wpm/migrations/0093_alter_handover_recive_user.py @@ -0,0 +1,21 @@ +# Generated by Django 3.2.12 on 2025-03-06 01:00 + +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), + ('wpm', '0092_auto_20250304_1433'), + ] + + operations = [ + migrations.AlterField( + model_name='handover', + name='recive_user', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='handover_recive_user', to=settings.AUTH_USER_MODEL, verbose_name='接收人'), + ), + ] diff --git a/apps/wpm/models.py b/apps/wpm/models.py index a55a8997..9f16a8e3 100644 --- a/apps/wpm/models.py +++ b/apps/wpm/models.py @@ -459,7 +459,7 @@ class Handover(CommonADModel): Dept, verbose_name='接收部门', on_delete=models.CASCADE, related_name='handover_recive_dept') recive_mgroup = models.ForeignKey(Mgroup, verbose_name='接收工段', on_delete=models.CASCADE, related_name='handover_recive_mgroup', null=True, blank=True) recive_user = models.ForeignKey( - User, verbose_name='接收人', on_delete=models.CASCADE, related_name='handover_recive_user') + User, verbose_name='接收人', on_delete=models.CASCADE, related_name='handover_recive_user', null=True, blank=True) wm = models.ForeignKey(WMaterial, verbose_name='关联车间库存', on_delete=models.SET_NULL, null=True, blank=True, related_name='handover_wm') mlog = models.ForeignKey(Mlog, verbose_name='关联日志记录', diff --git a/apps/wpm/services.py b/apps/wpm/services.py index 8ac20a0c..4d59f455 100644 --- a/apps/wpm/services.py +++ b/apps/wpm/services.py @@ -811,6 +811,8 @@ def handover_submit(handover:Handover, user: User, now: Union[datetime.datetime, handover.submit_user = user handover.submit_time = now + if handover.recive_user is None: + handover.recive_user = user handover.save() batches = list(set(batches))