diff --git a/hb_server/apps/qm/migrations/0022_auto_20211216_1401.py b/hb_server/apps/qm/migrations/0022_auto_20211216_1401.py new file mode 100644 index 0000000..b39573b --- /dev/null +++ b/hb_server/apps/qm/migrations/0022_auto_20211216_1401.py @@ -0,0 +1,25 @@ +# Generated by Django 3.2.9 on 2021-12-16 06:01 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('mtm', '0042_alter_recordformfield_field_type'), + ('qm', '0021_auto_20211216_1020'), + ] + + operations = [ + migrations.AlterField( + model_name='testrecorditem', + name='field_value', + field=models.JSONField(blank=True, null=True, verbose_name='录入值'), + ), + migrations.AlterField( + model_name='testrecorditem', + name='form_field', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='mtm.recordformfield', verbose_name='关联自定义表格字段'), + ), + ] diff --git a/hb_server/apps/qm/models.py b/hb_server/apps/qm/models.py index 7f0f558..e892071 100644 --- a/hb_server/apps/qm/models.py +++ b/hb_server/apps/qm/models.py @@ -77,8 +77,8 @@ class TestRecordItem(BaseModel): """ 记录表格字段值 """ - form_field = models.ForeignKey(RecordFormField, verbose_name='关联自定义表格字段', on_delete=models.CASCADE, db_constraint=False) - field_value = models.JSONField('录入值', default=dict, blank=True) + form_field = models.ForeignKey(RecordFormField, verbose_name='关联自定义表格字段', on_delete=models.CASCADE) + field_value = models.JSONField('录入值', null=True, blank=True) is_hidden = models.BooleanField('是否隐藏', default=False) is_testok = models.BooleanField('是否合格', null=True, blank=True) test_record = models.ForeignKey(TestRecord, verbose_name='关联的检验记录', on_delete=models.CASCADE, related_name='item_test_record') \ No newline at end of file diff --git a/hb_server/apps/wpm/migrations/0035_alter_operationrecorditem_field_value.py b/hb_server/apps/wpm/migrations/0035_alter_operationrecorditem_field_value.py new file mode 100644 index 0000000..59097bb --- /dev/null +++ b/hb_server/apps/wpm/migrations/0035_alter_operationrecorditem_field_value.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.9 on 2021-12-16 06:01 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('wpm', '0034_auto_20211216_1127'), + ] + + operations = [ + migrations.AlterField( + model_name='operationrecorditem', + name='field_value', + field=models.JSONField(blank=True, null=True, verbose_name='录入值'), + ), + ] diff --git a/hb_server/apps/wpm/models.py b/hb_server/apps/wpm/models.py index 3679faa..15b7a3f 100644 --- a/hb_server/apps/wpm/models.py +++ b/hb_server/apps/wpm/models.py @@ -188,7 +188,7 @@ class OperationRecordItem(BaseModel): 记录表格字段值 """ form_field = models.ForeignKey(RecordFormField, verbose_name='关联字段', on_delete=models.CASCADE, related_name='ori_form_field') - field_value = models.JSONField('录入值', default=dict, blank=True) + field_value = models.JSONField('录入值', null=True, blank=True) operation_record = models.ForeignKey(OperationRecord, verbose_name='关联的生产记录', on_delete=models.CASCADE, related_name='item_operation_record') class OperationEquip(BaseModel):