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

设备状态计算去重

This commit is contained in:
caoqianming 2021-10-20 09:24:06 +08:00
parent 0b5c837fe5
commit 5046f4dbb1
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -165,7 +165,7 @@ class ResourceViewSet(GenericViewSet):
rdata_l.append(i['id']) rdata_l.append(i['id'])
subproductions = SubProduction.objects.filter(product__id__in=rdata_l, is_deleted=False) subproductions = SubProduction.objects.filter(product__id__in=rdata_l, is_deleted=False)
steps = Step.objects.filter(usedstep__is_deleted=False, usedstep__subproduction__in=subproductions) steps = Step.objects.filter(usedstep__is_deleted=False, usedstep__subproduction__in=subproductions)
equips = Equipment.objects.filter(step_equips__in=steps, is_deleted=False) equips = Equipment.objects.filter(step_equips__in=steps, is_deleted=False).distinct()
serializer = EquipmentSerializer(instance=equips, many=True) serializer = EquipmentSerializer(instance=equips, many=True)
return Response(serializer.data) return Response(serializer.data)

1
hb_server/apps/wpm/models.py
View File

@ -7,7 +7,6 @@ from utils.model import SoftModel, BaseModel
from simple_history.models import HistoricalRecords from simple_history.models import HistoricalRecords
class Vendor(CommonAModel): class Vendor(CommonAModel):
""" """
供应商信息 供应商信息