From 5046f4dbb1727748c33d928b0fead754a5bbda4a Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Wed, 20 Oct 2021 09:24:06 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=8A=B6=E6=80=81=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97=E5=8E=BB=E9=87=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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):
     """
     供应商信息