From 8dcabaf8dc72dc413ed9b40ab76af075dcd0d737 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Wed, 19 Jan 2022 14:37:13 +0800
Subject: [PATCH] =?UTF-8?q?wproduct=20notok=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                    | 1 +
 hb_server/apps/wpm/filters.py | 3 +++
 hb_server/apps/wpm/views.py   | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index fa116e5..2f02e50 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,5 @@ deploy.sh
 package-lock.json
 .idea/
 .vscode/
+.idea/
 server/static/
\ No newline at end of file
diff --git a/hb_server/apps/wpm/filters.py b/hb_server/apps/wpm/filters.py
index c8392d3..d85c1cd 100644
--- a/hb_server/apps/wpm/filters.py
+++ b/hb_server/apps/wpm/filters.py
@@ -41,6 +41,9 @@ class WProductFilterSet(filters.FilterSet):
     def filter_tag(self, queryset, name, value):
         if value == 'no_scrap':
             queryset = queryset.exclude(act_state=WProduct.WPR_ACT_STATE_SCRAP)
+        elif value == 'notok':
+            queryset = queryset.filter(act_state__in=[WProduct.WPR_ACT_STATE_NOTOK, WProduct.WPR_ACT_STATE_SCRAP])\
+                        .exclude(step__process__id = 1) # 不算冷加工的报废
         return queryset
 
 
diff --git a/hb_server/apps/wpm/views.py b/hb_server/apps/wpm/views.py
index 475b0d1..caababf 100644
--- a/hb_server/apps/wpm/views.py
+++ b/hb_server/apps/wpm/views.py
@@ -16,7 +16,7 @@ from rest_framework.decorators import action
 from apps.wf.models import Workflow
 from apps.wpm.filters import CuttingFilterSet, OperationRecordFilterSet, WMaterialFilterSet, WProductFilterSet
 from apps.wpm.models import OperationEquip, OperationWproduct, Pick, PickWproduct, WMaterial, WProduct, Operation, \
-    OperationMaterial, OperationRecord, OperationRecordItem, WprouctTicket
+    OperationMaterial, OperationRecord, OperationRecordItem, WproductFlow, WprouctTicket
 
 from apps.wpm.serializers import CuttingListSerializer, OperationEquipListSerializer, OperationEquipUpdateSerializer, \
     OperationMaterialCreate1ListSerailizer, OperationMaterialCreate1Serailizer, OperationMaterialCreate2ListSerailizer, \