feat: mlogbdefect defect可为空代表合格品

This commit is contained in:
caoqianming 2025-03-07 08:51:01 +08:00
parent 1844fa7228
commit 2a9bd7ef6a
2 changed files with 22 additions and 4 deletions

View File

@ -0,0 +1,20 @@
# Generated by Django 3.2.12 on 2025-03-07 00:47
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('qm', '0047_ftestwork_count_ok_full'),
('wpm', '0094_auto_20250306_1414'),
]
operations = [
migrations.AlterField(
model_name='mlogbdefect',
name='defect',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='qm.defect', verbose_name='缺陷'),
),
]

View File

@ -321,9 +321,7 @@ class Mlogb(BaseModel):
on_delete=models.CASCADE, related_name='mlogb_mtask', null=True, blank=True)
wm_in = models.ForeignKey(WMaterial, verbose_name='投入物料所在库存',
on_delete=models.SET_NULL, null=True, blank=True, related_name="mlogb_wm_in")
wm_to = models.ForeignKey(WMaterial, verbose_name='产出物料所在库存',
on_delete=models.SET_NULL, null=True, blank=True, related_name="mlogb_wm_to")
on_delete=models.SET_NULL, null=True, blank=True)
material_in = models.ForeignKey(
Material, verbose_name='投入物料', on_delete=models.CASCADE, related_name='mlogb_material_in',
null=True, blank=True)
@ -410,7 +408,7 @@ class Mlogb(BaseModel):
class MlogbDefect(BaseModel):
mlogb = models.ForeignKey(Mlogb, verbose_name='生产记录', on_delete=models.CASCADE)
defect = models.ForeignKey("qm.Defect", verbose_name='缺陷', on_delete=models.CASCADE)
defect = models.ForeignKey("qm.Defect", verbose_name='缺陷', on_delete=models.CASCADE, null=True, blank=True)
count_test = models.IntegerField("抽检数", null=True, blank=True)
floor = models.IntegerField("层数", null=True, blank=True)
count = models.PositiveIntegerField('数量', default=0)