diff --git a/apps/wpmw/migrations/0001_initial.py b/apps/wpmw/migrations/0001_initial.py index d1e24932..6ea3e626 100644 --- a/apps/wpmw/migrations/0001_initial.py +++ b/apps/wpmw/migrations/0001_initial.py @@ -18,7 +18,7 @@ class Migration(migrations.Migration): operations = [ migrations.CreateModel( - name='WpDefect', + name='WprDefect', fields=[ ('id', models.CharField(editable=False, help_text='主键ID', max_length=20, primary_key=True, serialize=False, verbose_name='主键ID')), ('create_time', models.DateTimeField(default=django.utils.timezone.now, help_text='创建时间', verbose_name='创建时间')), @@ -40,7 +40,7 @@ class Migration(migrations.Migration): ('is_deleted', models.BooleanField(default=False, help_text='删除标记', verbose_name='删除标记')), ('number', models.CharField(blank=True, max_length=50, null=True, unique=True, verbose_name='编号')), ('state', models.PositiveSmallIntegerField(choices=[(10, '合格'), (20, '不合格'), (30, '返修'), (40, '检验'), (50, '报废')], default=10, verbose_name='状态')), - ('defects', models.ManyToManyField(through='wpmw.WpDefect', to='qm.Defect', verbose_name='缺陷项')), + ('defects', models.ManyToManyField(through='wpmw.WprDefect', to='qm.Defect', verbose_name='缺陷项')), ('material', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='mtm.material', verbose_name='当前物料形态')), ('mb', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='inm.materialbatch', verbose_name='仓库物料')), ('wm', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='wpm.wmaterial', verbose_name='车间物料')), @@ -50,7 +50,7 @@ class Migration(migrations.Migration): }, ), migrations.AddField( - model_name='wpdefect', + model_name='wprdefect', name='wpr', field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='wpmw.wpr', verbose_name='关联产物'), ), diff --git a/apps/wpmw/models.py b/apps/wpmw/models.py index e4fea4f9..64bb9d05 100644 --- a/apps/wpmw/models.py +++ b/apps/wpmw/models.py @@ -12,7 +12,7 @@ class Wpr(BaseModel): number = models.CharField("编号", max_length=50, unique=True, null=True, blank=True) state = models.PositiveSmallIntegerField('状态', default=10, choices=((10, '合格'), (20, '不合格'), (30, '返修'), (40, '检验'), (50, '报废'))) material = models.ForeignKey(Material, verbose_name="当前物料形态", on_delete=models.CASCADE) - defects = models.ManyToManyField("qm.defect", through="wpmw.wpdefect", verbose_name="缺陷项") + defects = models.ManyToManyField("qm.defect", through="wpmw.wprdefect", verbose_name="缺陷项") mb = models.ForeignKey("inm.materialbatch", verbose_name="仓库物料", on_delete=models.CASCADE, null=True, blank=True) @@ -32,7 +32,7 @@ class Wpr(BaseModel): ins.save() -class WpDefect(BaseModel): +class WprDefect(BaseModel): wpr = models.ForeignKey(Wpr, verbose_name="关联产物", on_delete=models.CASCADE) defect = models.ForeignKey("qm.defect", verbose_name="关联缺陷项", on_delete=models.CASCADE) is_main = models.BooleanField("是否主要缺陷", default=False) \ No newline at end of file