diff --git a/hb_server/apps/pm/migrations/0006_alter_subproductionprogress_count_real.py b/hb_server/apps/pm/migrations/0006_alter_subproductionprogress_count_real.py new file mode 100644 index 0000000..a4924dd --- /dev/null +++ b/hb_server/apps/pm/migrations/0006_alter_subproductionprogress_count_real.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.6 on 2021-10-19 01:58 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('pm', '0005_auto_20211019_0944'), + ] + + operations = [ + migrations.AlterField( + model_name='subproductionprogress', + name='count_real', + field=models.IntegerField(default=0, verbose_name='实际出入数'), + ), + ] diff --git a/hb_server/apps/pm/models.py b/hb_server/apps/pm/models.py index 418e4dc..8e9299d 100644 --- a/hb_server/apps/pm/models.py +++ b/hb_server/apps/pm/models.py @@ -62,4 +62,4 @@ class SubProductionProgress(BaseModel): material = models.ForeignKey(Material, verbose_name='关联物料', on_delete=models.CASCADE) type = models.IntegerField('物料应用类型', default=1) count = models.IntegerField('应出入数') - count_real = models.IntegerField('实际出入数') + count_real = models.IntegerField('实际出入数', default=0) diff --git a/hb_server/apps/wf/migrations/0014_wfscript.py b/hb_server/apps/wf/migrations/0014_wfscript.py new file mode 100644 index 0000000..2b88441 --- /dev/null +++ b/hb_server/apps/wf/migrations/0014_wfscript.py @@ -0,0 +1,36 @@ +# Generated by Django 3.2.6 on 2021-10-19 01:58 + +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 = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('wf', '0013_alter_ticketflow_transition'), + ] + + operations = [ + migrations.CreateModel( + name='WfScript', + 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='删除标记')), + ('usage', models.IntegerField(choices=[(1, '获取处理人'), (2, '执行操作')], default=1, verbose_name='脚本用途')), + ('wait', models.BooleanField(default=True, verbose_name='是否等待执行完成')), + ('name', models.CharField(max_length=100, verbose_name='脚本名称')), + ('content', models.TextField(verbose_name='脚本内容')), + ('create_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='wfscript_create_by', to=settings.AUTH_USER_MODEL, verbose_name='创建人')), + ('update_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='wfscript_update_by', to=settings.AUTH_USER_MODEL, verbose_name='最后编辑人')), + ('workflow', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='wf.workflow', verbose_name='关联工作流')), + ], + options={ + 'abstract': False, + }, + ), + ]