From 13f7a31d1655b2e874b159a5337b3d907ef8a9ce Mon Sep 17 00:00:00 2001 From: caoqianming Date: Tue, 11 Oct 2022 15:53:59 +0800 Subject: [PATCH] =?UTF-8?q?opl=E5=A2=9E=E5=8A=A0workscope?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/opm/migrations/0006_opl_work_scope.py | 18 ++++++++++++++++++ apps/opm/models.py | 1 + apps/opm/services.py | 1 + 3 files changed, 20 insertions(+) create mode 100644 apps/opm/migrations/0006_opl_work_scope.py diff --git a/apps/opm/migrations/0006_opl_work_scope.py b/apps/opm/migrations/0006_opl_work_scope.py new file mode 100644 index 00000000..8070b129 --- /dev/null +++ b/apps/opm/migrations/0006_opl_work_scope.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.12 on 2022-10-11 07:53 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('opm', '0005_auto_20220912_1838'), + ] + + operations = [ + migrations.AddField( + model_name='opl', + name='work_scope', + field=models.CharField(blank=True, max_length=200, null=True, verbose_name='作业范围'), + ), + ] diff --git a/apps/opm/models.py b/apps/opm/models.py index c94218bc..11aa9710 100644 --- a/apps/opm/models.py +++ b/apps/opm/models.py @@ -74,6 +74,7 @@ class Opl(CommonBDModel): operation = models.ForeignKey(Operation, verbose_name='关联作业', on_delete=models.CASCADE, related_name='opl_operation') number = models.CharField('作业许可编号', max_length=20, null=True, blank=True) + work_scope = models.CharField('作业范围', max_length=200, null=True, blank=True) level = models.CharField('作业级别', max_length=20, help_text='特技/三级/二级/主干道/次干道', null=True, blank=True) cate = models.ForeignKey(OplCate, verbose_name='作业许可种类', diff --git a/apps/opm/services.py b/apps/opm/services.py index 80890015..bb819df4 100644 --- a/apps/opm/services.py +++ b/apps/opm/services.py @@ -41,6 +41,7 @@ def bind_opl(ticket: Ticket, transition: Transition, new_ticket_data: dict): ticket_data.update({ 'operation': opl.operation.id, # operation id值 'level': opl.level, + 'power_days': opl.power_days, 'monitor': opl.monitor.id, 'workers': list(OplWorker.objects.filter(opl=opl).values_list('worker__id', flat=True)), 'charger': opl.charger.id,