From c5fc214c10ddeb91b72a42e28fad203e7ebed642 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Wed, 20 Oct 2021 11:12:21 +0800
Subject: [PATCH] =?UTF-8?q?eval=E5=87=BD=E6=95=B0=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hb_server/apps/inm/models.py  | 13 +++++++++++--
 hb_server/apps/wf/services.py |  4 ++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/hb_server/apps/inm/models.py b/hb_server/apps/inm/models.py
index 52a7ddc..372e384 100644
--- a/hb_server/apps/inm/models.py
+++ b/hb_server/apps/inm/models.py
@@ -6,7 +6,7 @@ from apps.system.models import CommonAModel, CommonBModel, Organization, User, D
 from utils.model import SoftModel, BaseModel
 from simple_history.models import HistoricalRecords
 from apps.mtm.models import Material
-
+from apps.pm.models import SubProductionPlan
 
 
 class WareHouse(CommonAModel):
@@ -57,4 +57,13 @@ class FIFO(CommonAModel):
         (3, '采购入库'),
         (4, '生产入库')
     )
-    type = models.IntegerField('出入库类型', default=1)
\ No newline at end of file
+    type = models.IntegerField('出入库类型', default=1)
+    operator = models.ForeignKey(User, verbose_name='操作人', on_delete=models.CASCADE)
+    subproduction_plan = models.ForeignKey(SubProductionPlan, verbose_name='关联子生产计划', on_delete=models.DO_NOTHING, null=True, blank=True)
+
+class FIFODetail(CommonAModel):
+    """
+    领料详细记录
+    """
+
+    
diff --git a/hb_server/apps/wf/services.py b/hb_server/apps/wf/services.py
index 5bc23e1..e9a0cb4 100644
--- a/hb_server/apps/wf/services.py
+++ b/hb_server/apps/wf/services.py
@@ -7,7 +7,7 @@ from rest_framework.exceptions import APIException
 from django.utils import timezone
 from datetime import timedelta
 import random
-from ast import literal_eval
+
 class WfService(object):
     @staticmethod
     def get_worlflow_states(workflow:Workflow):
@@ -116,7 +116,7 @@ class WfService(object):
             for i in transition.condition_expression:
                 expression = i['expression'].format(**ticket_all_value)
                 import datetime, time  # 用于支持条件表达式中对时间的操作
-                if literal_eval(expression):
+                if eval(expression):
                     destination_state = State.objects.get(pk=i['target_state'])
         return destination_state