From 2a9bd7ef6a7d65ca0a7c788b3777ca9b0fcc8fc5 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 7 Mar 2025 08:51:01 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20mlogbdefect=20defect=E5=8F=AF=E4=B8=BA?= =?UTF-8?q?=E7=A9=BA=E4=BB=A3=E8=A1=A8=E5=90=88=E6=A0=BC=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../0095_alter_mlogbdefect_defect.py | 20 +++++++++++++++++++ apps/wpm/models.py | 6 ++---- 2 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 apps/wpm/migrations/0095_alter_mlogbdefect_defect.py diff --git a/apps/wpm/migrations/0095_alter_mlogbdefect_defect.py b/apps/wpm/migrations/0095_alter_mlogbdefect_defect.py new file mode 100644 index 00000000..e3bd0a69 --- /dev/null +++ b/apps/wpm/migrations/0095_alter_mlogbdefect_defect.py @@ -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='缺陷'), + ), + ] diff --git a/apps/wpm/models.py b/apps/wpm/models.py index 01c814e2..79bc12e0 100644 --- a/apps/wpm/models.py +++ b/apps/wpm/models.py @@ -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)