diff --git a/apps/qm/models.py b/apps/qm/models.py index b6c693c0..8685db69 100644 --- a/apps/qm/models.py +++ b/apps/qm/models.py @@ -177,7 +177,7 @@ class Qct(CommonAModel): qct = Qct.objects.get(qctmat__material=material, tags__contains=tag) except Qct.DoesNotExist: try: - qct = Qct.objects.ge(name="通用检验表") + qct = Qct.objects.get(name="默认检验表") except Qct.DoesNotExist: qct = None except Qct.MultipleObjectsReturned: @@ -198,7 +198,7 @@ class Qct(CommonAModel): def get_qs(cls, materialId:str, tag:str): qct_qs = Qct.objects.filter(qctmat__material__id=materialId, tags__contains=tag) if not qct_qs.exists(): - qct_qs = Qct.objects.filter(tags__contains="default") + qct_qs = Qct.objects.filter(name="默认检验表") return qct_qs class QctTestItem(BaseModel): diff --git a/apps/qm/views.py b/apps/qm/views.py index a8d0948b..6b4c8ada 100644 --- a/apps/qm/views.py +++ b/apps/qm/views.py @@ -53,10 +53,15 @@ class QctViewSet(CustomModelViewSet): @action(methods=['post'], detail=False, perms_map={'post': '*'}, serializer_class=QctGetSerializer) @transaction.atomic - def get_qs(self, request, *args, **kwargs): + def get_qct(self, request, *args, **kwargs): + """ + 获取检验模板 + + 获取检验模板 + """ data = request.data - qct_qs = Qct.get_qs(data["material"], data["tag"]) - return QctSerializer(instance=qct_qs, many=True).data + qct = Qct.get(data["material"], data["tag"]) + return QctSerializer(instance=qct).data class QctTestItemViewSet(CustomModelViewSet):