diff --git a/hb_server/apps/em/migrations/0003_equipment_type.py b/hb_server/apps/em/migrations/0003_equipment_type.py new file mode 100644 index 0000000..5615a9b --- /dev/null +++ b/hb_server/apps/em/migrations/0003_equipment_type.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.6 on 2021-08-31 06:41 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('em', '0002_alter_equipment_model'), + ] + + operations = [ + migrations.AddField( + model_name='equipment', + name='type', + field=models.IntegerField(choices=[(1, '生产设备'), (2, '检验工具')], default=1, verbose_name='类型'), + ), + ] diff --git a/hb_server/apps/mtm/migrations/0007_auto_20210831_1441.py b/hb_server/apps/mtm/migrations/0007_auto_20210831_1441.py new file mode 100644 index 0000000..31b351d --- /dev/null +++ b/hb_server/apps/mtm/migrations/0007_auto_20210831_1441.py @@ -0,0 +1,47 @@ +# Generated by Django 3.2.6 on 2021-08-31 06:41 + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion +import django.utils.timezone + + +class Migration(migrations.Migration): + + dependencies = [ + ('system', '0003_auto_20210812_0909'), + ('em', '0003_equipment_type'), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('mtm', '0006_auto_20210830_1331'), + ] + + operations = [ + migrations.AddField( + model_name='process', + name='workshop', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='system.organization', verbose_name='生产车间'), + ), + migrations.AddField( + model_name='step', + name='equipments', + field=models.ManyToManyField(to='em.Equipment', verbose_name='使用设备'), + ), + migrations.CreateModel( + name='UsedStep', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('create_time', models.DateTimeField(default=django.utils.timezone.now, help_text='创建时间', verbose_name='创建时间')), + ('update_time', models.DateTimeField(auto_now=True, help_text='修改时间', verbose_name='修改时间')), + ('is_deleted', models.BooleanField(default=False, help_text='删除标记', verbose_name='删除标记')), + ('create_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='usedstep_create_by', to=settings.AUTH_USER_MODEL, verbose_name='创建人')), + ('process', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='mtm.process', verbose_name='关联工序')), + ('product', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='mtm.material', verbose_name='关联产品')), + ('step', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='usedsteps', to='mtm.step', verbose_name='子工序')), + ('update_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='usedstep_update_by', to=settings.AUTH_USER_MODEL, verbose_name='最后编辑人')), + ], + options={ + 'verbose_name': '产品生产子工序', + 'verbose_name_plural': '产品生产子工序', + }, + ), + ] diff --git a/hb_server/utils/response.py b/hb_server/utils/response.py index 1b11f4b..4657b5e 100644 --- a/hb_server/utils/response.py +++ b/hb_server/utils/response.py @@ -50,12 +50,13 @@ class FitJSONRenderer(JSONRenderer): response_body.code = response.status_code if response_body.code >= 400: # 响应异常 response_body.data = data # data里是详细异常信息 + prefix = "" if isinstance(data, dict): - key = list(data.keys())[0] - data = key + data[key] - elif isinstance(data, list): + prefix = list(data.keys())[0] + data = data[prefix] + if isinstance(data, list): data = data[0] - response_body.msg = data # 取一部分放入msg,方便前端alert + response_body.msg = prefix + ":" + data # 取一部分放入msg,方便前端alert else: response_body.data = data renderer_context.get("response").status_code = 200 # 统一成200响应,用code区分