diff --git a/apps/wpm/migrations/0022_mlog_shift.py b/apps/wpm/migrations/0022_mlog_shift.py new file mode 100644 index 00000000..36e1418d --- /dev/null +++ b/apps/wpm/migrations/0022_mlog_shift.py @@ -0,0 +1,20 @@ +# Generated by Django 3.2.12 on 2023-10-31 07:45 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('mtm', '0020_material_cate'), + ('wpm', '0021_auto_20231031_1505'), + ] + + operations = [ + migrations.AddField( + model_name='mlog', + name='shift', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='mtm.shift', verbose_name='关联班次'), + ), + ] diff --git a/apps/wpm/models.py b/apps/wpm/models.py index 76a81895..73bc1eb0 100644 --- a/apps/wpm/models.py +++ b/apps/wpm/models.py @@ -94,6 +94,9 @@ class Mlog(CommonADModel): equipment_2 = models.ForeignKey( Equipment, verbose_name='生产设备2', on_delete=models.CASCADE, null=True, blank=True, related_name='mlog_equipment_2') index = models.PositiveSmallIntegerField('第几锅', default=0) + + shift = models.ForeignKey( + Shift, verbose_name='关联班次', on_delete=models.SET_NULL, null=True, blank=True) batch = models.CharField('批次号', max_length=50) count_use = models.PositiveIntegerField('领用数', default=0) count_real = models.PositiveIntegerField('实际生产数', default=0) diff --git a/apps/wpm/serializers.py b/apps/wpm/serializers.py index 28163988..28488ee5 100644 --- a/apps/wpm/serializers.py +++ b/apps/wpm/serializers.py @@ -100,6 +100,7 @@ class MlogSerializer(CustomModelSerializer): source='equipment.name', read_only=True) equipment_2_name = serializers.CharField( source='equipment_2.name', read_only=True) + shift_name = serializers.CharField(source='shift.name', read_only=True) class Meta: model = Mlog