diff --git a/hb_server/apps/pm/views.py b/hb_server/apps/pm/views.py index d625812..62c2473 100644 --- a/hb_server/apps/pm/views.py +++ b/hb_server/apps/pm/views.py @@ -122,7 +122,7 @@ class SubProductionPlanViewSet(CreateUpdateModelAMixin, ListModelMixin, UpdateMo obj.save() return Response() raise APIException('计划状态有误') - + class ResourceViewSet(GenericViewSet): perms_map = {'*': '*'} @@ -165,7 +165,7 @@ class ResourceViewSet(GenericViewSet): rdata_l.append(i['id']) subproductions = SubProduction.objects.filter(product__id__in=rdata_l, is_deleted=False) 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) return Response(serializer.data) diff --git a/hb_server/apps/wpm/models.py b/hb_server/apps/wpm/models.py index a705f8a..ab9aa54 100644 --- a/hb_server/apps/wpm/models.py +++ b/hb_server/apps/wpm/models.py @@ -7,7 +7,6 @@ from utils.model import SoftModel, BaseModel from simple_history.models import HistoricalRecords - class Vendor(CommonAModel): """ 供应商信息