feat: wpmw添加字段

This commit is contained in:
caoqianming 2025-02-12 15:10:00 +08:00
parent a88f7e282e
commit 861bb03469
3 changed files with 34 additions and 1 deletions

View File

@ -0,0 +1,30 @@
# Generated by Django 3.2.12 on 2025-02-12 03:58
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('em', '0021_auto_20241203_1531'),
('wpm', '0086_alter_handover_type'),
]
operations = [
migrations.AddField(
model_name='mlogbw',
name='equip',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='em.equipment', verbose_name='设备'),
),
migrations.AddField(
model_name='mlogbw',
name='work_end_time',
field=models.DateTimeField(blank=True, null=True, verbose_name='结束加工时间'),
),
migrations.AddField(
model_name='mlogbw',
name='work_start_time',
field=models.DateTimeField(blank=True, null=True, verbose_name='开始加工时间'),
),
]

View File

@ -355,6 +355,9 @@ class Mlogbw(BaseModel):
mlogb = models.ForeignKey(Mlogb, verbose_name='生产记录', on_delete=models.CASCADE)
wpr = models.ForeignKey("wpmw.wpr", verbose_name='关联产品', on_delete=models.SET_NULL
, related_name='wpr_mlogbw', null=True, blank=True)
equip = models.ForeignKey(Equipment, verbose_name='设备', on_delete=models.SET_NULL, null=True, blank=True)
work_start_time = models.DateTimeField('开始加工时间', null=True, blank=True)
work_end_time = models.DateTimeField('结束加工时间', null=True, blank=True)
ftest = models.OneToOneField("qm.ftest", verbose_name='关联检验',
on_delete=models.PROTECT, null=True, blank=True, related_name="mlogbw_ftest")
note = models.TextField('备注', null=True, blank=True)

View File

@ -580,7 +580,7 @@ class MlogbwCreateUpdateSerializer(CustomModelSerializer):
ftest = FtestProcessSerializer(required=False)
class Meta:
model = Mlogbw
fields = ["id", "number", "wpr", "note", "mlogb", "ftest"]
fields = ["id", "number", "wpr", "note", "mlogb", "ftest", "equip", "work_start_time", "work_end_time"]
def validate(self, attrs):
mlogb:Mlogb = attrs["mlogb"]