From 0eec676228823879939ee82aacc7c58e8e85ddf8 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Thu, 23 Dec 2021 09:10:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=A1=E5=8F=B7=E5=8A=A0=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hb_server/apps/wpm/apps.py    | 4 ++++
 hb_server/apps/wpm/models.py  | 1 -
 hb_server/apps/wpm/signals.py | 5 +++--
 hb_server/apps/wpm/views.py   | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/hb_server/apps/wpm/apps.py b/hb_server/apps/wpm/apps.py
index 7c2337e..3f5a5ef 100644
--- a/hb_server/apps/wpm/apps.py
+++ b/hb_server/apps/wpm/apps.py
@@ -4,4 +4,8 @@ class WpmConfig(AppConfig):
     name = 'apps.wpm'
     verbose_name = '车间生产'
 
+    def ready(self):
+        # 加载信号
+        import apps.wpm.signals
+
 
diff --git a/hb_server/apps/wpm/models.py b/hb_server/apps/wpm/models.py
index f34ceaf..169e295 100644
--- a/hb_server/apps/wpm/models.py
+++ b/hb_server/apps/wpm/models.py
@@ -94,7 +94,6 @@ class WprouctTicket(CommonAModel):
     material = models.ForeignKey(Material, verbose_name='所在物料状态', on_delete=models.CASCADE)
     step = models.ForeignKey(Step, verbose_name='所在步骤', on_delete=models.CASCADE)
     subproduction_plan = models.ForeignKey(SubProductionPlan, verbose_name='所在子生产计划', on_delete=models.CASCADE)
-    test_record = models.ForeignKey('qm.testrecord', verbose_name='关联检验记录', on_delete=models.CASCADE, null=True, blank=True)
     
     ticket = models.ForeignKey('wf.ticket', verbose_name='关联工单', on_delete=models.CASCADE, related_name='wt_ticket')
     decision = models.CharField('最终决定', null=True, blank=True, max_length=100)
diff --git a/hb_server/apps/wpm/signals.py b/hb_server/apps/wpm/signals.py
index 70e5693..2c816a2 100644
--- a/hb_server/apps/wpm/signals.py
+++ b/hb_server/apps/wpm/signals.py
@@ -22,7 +22,8 @@ def handleTicket(sender, instance, created, **kwargs):
             obj.step = wproduct.step
             obj.subproduction_plan = wproduct.subproduction_plan
             obj.ticket = instance
-            obj.test_record = TestRecord.objects.filter(wproduct=wproduct, is_deleted=False, is_testok=False).order_by('-id').first()
+            
+            test_record = TestRecord.objects.filter(wproduct=wproduct, is_deleted=False, is_testok=False).order_by('-id').first()
             obj.save()
 
             # 工单绑定半成品
@@ -31,7 +32,7 @@ def handleTicket(sender, instance, created, **kwargs):
 
             # 检验员
             if not ticket_data.get('tester', None):
-                ticket_data['tester'] = obj.test_record.create_by.id
+                ticket_data['tester'] = test_record.create_by.id
                 instance.ticket_data = ticket_data
                 instance.save()
 
diff --git a/hb_server/apps/wpm/views.py b/hb_server/apps/wpm/views.py
index 6f04141..34556f6 100644
--- a/hb_server/apps/wpm/views.py
+++ b/hb_server/apps/wpm/views.py
@@ -384,7 +384,7 @@ class WProductViewSet(ListModelMixin, GenericViewSet):
             ret['exist_data'] = exist_data
             return Response(ret)
         else:
-            raise exceptions.APIException('未找到对应工作流程')
+            raise exceptions.APIException('未找到对应审批流程')