zcdsj
/
hberp
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wproduct notok筛选

This commit is contained in:
caoqianming 2022-01-19 14:37:13 +08:00
parent b8824e94ac
commit 8dcabaf8dc
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -4,4 +4,5 @@ deploy.sh
package-lock.json
.idea/
.vscode/
.idea/
server/static/

3
hb_server/apps/wpm/filters.py
View File

@ -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

2
hb_server/apps/wpm/views.py
View File

@ -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, \