feat: mlog增加equipments字段

This commit is contained in:
caoqianming 2023-12-27 09:51:04 +08:00
parent 6515324b5c
commit c91533a328
4 changed files with 25 additions and 1 deletions

View File

@ -0,0 +1,19 @@
# Generated by Django 3.2.12 on 2023-12-27 01:46
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('em', '0009_alter_equipment_description'),
('wpm', '0038_auto_20231218_1420'),
]
operations = [
migrations.AddField(
model_name='mlog',
name='equipments',
field=models.ManyToManyField(blank=True, to='em.Equipment', verbose_name='多选生产设备'),
),
]

View File

@ -104,6 +104,8 @@ class Mlog(CommonADModel):
Equipment, verbose_name='生产设备', on_delete=models.CASCADE, null=True, blank=True, related_name='mlog_equipment')
equipment_2 = models.ForeignKey(
Equipment, verbose_name='生产设备2', on_delete=models.CASCADE, null=True, blank=True, related_name='mlog_equipment_2')
equipments = models.ManyToManyField(
Equipment, verbose_name='多选生产设备', blank=True)
index = models.PositiveSmallIntegerField('第几锅', default=0)
shift = models.ForeignKey(

View File

@ -215,6 +215,8 @@ class MlogSerializer(CustomModelSerializer):
label='多产出件信息', many=True, required=False)
handle_users_ = UserSimpleSerializer(
source='handle_users', many=True, read_only=True)
equipments_name = serializers.StringRelatedField(
source='equipments', read_only=True, many=True)
class Meta:
model = Mlog

View File

@ -134,7 +134,8 @@ class MlogViewSet(CustomModelViewSet):
serializer_class = MlogSerializer
select_related_fields = ['create_by', 'update_by', 'mtask',
'handle_user', 'handle_user_2', 'equipment', 'equipment_2']
prefetch_related_fields = ['handle_users', 'material_outs', 'b_mlog']
prefetch_related_fields = ['handle_users',
'material_outs', 'b_mlog', 'equipments']
filterset_class = MlogFilter
@transaction.atomic