From 827d40a3f9a81ab0999b9ca4500b6ccce4e69f8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E5=89=8D=E6=98=8E?= <909355014@qq.com> Date: Fri, 23 Sep 2022 12:16:12 +0800 Subject: [PATCH] =?UTF-8?q?2=E5=88=86=E9=92=9F=E4=B8=8D=E5=86=8D=E6=AC=A1?= =?UTF-8?q?=E8=A7=A6=E5=8F=91=20=E8=BF=9D=E8=A7=84=E8=BF=9B=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/ecm/service.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/apps/ecm/service.py b/apps/ecm/service.py index 58c34e32..02f1a07e 100644 --- a/apps/ecm/service.py +++ b/apps/ecm/service.py @@ -492,6 +492,10 @@ def handle_xx_event_2(name: str, ep: Employee, area: Area): # 违规进入事件特殊处理 # 找寻该区域下审批和进行的作业, 本厂或相关方人员, 如是就不触发 if name == 'i_enter' and ep.type in ['employee', 'remployee']: + last_event = Event.objects.filter( + cates__code='i_enter', employee=ep, area=area).order_by('-create_time').first() + if last_event and last_event.create_time + timedelta(minutes=2) > timezone.now(): # 2分钟不再次触发 + return ops = Operation.objects.filter(area=area, state__in=[Operation.OP_AUDIT, Operation.OP_WAIT, Operation.OP_WORK]) if OplWorker.objects.filter(opl__operation__in=ops, worker__employee=ep).exists(): # 如果是作业人员