diff --git a/apps/inm/migrations/0027_alter_materialbatch_unique_together.py b/apps/inm/migrations/0027_alter_materialbatch_unique_together.py new file mode 100644 index 00000000..b17b502d --- /dev/null +++ b/apps/inm/migrations/0027_alter_materialbatch_unique_together.py @@ -0,0 +1,17 @@ +# Generated by Django 3.2.12 on 2025-02-21 09:23 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('inm', '0026_mioitemw_ftest'), + ] + + operations = [ + migrations.AlterUniqueTogether( + name='materialbatch', + unique_together=set(), + ), + ] diff --git a/apps/inm/models.py b/apps/inm/models.py index 57a8b6fb..c0244bd4 100644 --- a/apps/inm/models.py +++ b/apps/inm/models.py @@ -36,9 +36,6 @@ class MaterialBatch(BaseModel): material_ofrom = models.ForeignKey(Material, verbose_name='原料物料', on_delete=models.SET_NULL, null=True, blank=True, related_name='mb_mofrom') defect = models.ForeignKey('qm.defect', verbose_name='缺陷', on_delete=models.PROTECT, null=True, blank=True) - class Meta: - unique_together = ('material', 'batch', 'warehouse') - class MaterialBatchA(BaseModel): """ diff --git a/apps/inm/services.py b/apps/inm/services.py index 4f05a2b7..c7a9d36e 100644 --- a/apps/inm/services.py +++ b/apps/inm/services.py @@ -325,7 +325,7 @@ class InmService: state = WMaterial.WM_OK if defect: state = WMaterial.WM_NOTOK - mb, _ = MaterialBatch.safe_get_or_create( + mb, _ = MaterialBatch.objects.get_or_create( material=material, warehouse=warehouse, batch=batch,