feat: 有限空间气体检测记录必填

This commit is contained in:
caoqianming 2023-06-05 14:30:13 +08:00
parent 50fe411b71
commit 31f5a402c0
3 changed files with 28 additions and 3 deletions

View File

@ -0,0 +1,23 @@
# Generated by Django 3.2.12 on 2023-06-05 06:29
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('opm', '0012_alter_opl_level'),
]
operations = [
migrations.AlterField(
model_name='oplcate',
name='code',
field=models.CharField(max_length=10, verbose_name='标识'),
),
migrations.AlterField(
model_name='oplcate',
name='name',
field=models.CharField(max_length=20, verbose_name='名称'),
),
]

View File

@ -9,8 +9,8 @@ class OplCate(CommonAModel):
""" """
作业许可种类 作业许可种类
""" """
code = models.CharField('标识', max_length=10, unique=True) code = models.CharField('标识', max_length=10)
name = models.CharField('名称', max_length=20, unique=True) name = models.CharField('名称', max_length=20)
sort = models.PositiveSmallIntegerField('排序', default=1) sort = models.PositiveSmallIntegerField('排序', default=1)
description = models.TextField('描述', null=True, blank=True) description = models.TextField('描述', null=True, blank=True)
template_export = models.TextField('导出word模板', null=True, blank=True) template_export = models.TextField('导出word模板', null=True, blank=True)

View File

@ -2,7 +2,7 @@
import time import time
from apps.ecm.service import check_not_in_place, snap_and_analyse from apps.ecm.service import check_not_in_place, snap_and_analyse
from apps.ecm.models import EventCate from apps.ecm.models import EventCate
from apps.opm.models import Operation, Opl, OplWorker from apps.opm.models import Operation, Opl, OplWorker, GasCheck
from apps.third.models import TDevice from apps.third.models import TDevice
from apps.utils.sms import send_sms from apps.utils.sms import send_sms
from apps.wf.models import Ticket, Transition from apps.wf.models import Ticket, Transition
@ -41,6 +41,8 @@ def get_op_monitor(state, ticket, new_ticket_data, handler):
def bind_opl(ticket: Ticket, transition: Transition, new_ticket_data: dict): def bind_opl(ticket: Ticket, transition: Transition, new_ticket_data: dict):
opl = Opl.objects.get(id=new_ticket_data['opl']) opl = Opl.objects.get(id=new_ticket_data['opl'])
if '有限空间' in opl.cate.name and GasCheck.objects.filter(opl=opl).count() == 0:
raise ParseError('该许可证需填写气体检测记录!')
ticket_data = ticket.ticket_data ticket_data = ticket.ticket_data
ticket_data.update({ ticket_data.update({
'operation': opl.operation.id, # operation id值 'operation': opl.operation.id, # operation id值