feat: 获取检验模板只用单个
This commit is contained in:
parent
6fcda8c0a7
commit
d9f66d2970
|
@ -177,7 +177,7 @@ class Qct(CommonAModel):
|
||||||
qct = Qct.objects.get(qctmat__material=material, tags__contains=tag)
|
qct = Qct.objects.get(qctmat__material=material, tags__contains=tag)
|
||||||
except Qct.DoesNotExist:
|
except Qct.DoesNotExist:
|
||||||
try:
|
try:
|
||||||
qct = Qct.objects.ge(name="通用检验表")
|
qct = Qct.objects.get(name="默认检验表")
|
||||||
except Qct.DoesNotExist:
|
except Qct.DoesNotExist:
|
||||||
qct = None
|
qct = None
|
||||||
except Qct.MultipleObjectsReturned:
|
except Qct.MultipleObjectsReturned:
|
||||||
|
@ -198,7 +198,7 @@ class Qct(CommonAModel):
|
||||||
def get_qs(cls, materialId:str, tag:str):
|
def get_qs(cls, materialId:str, tag:str):
|
||||||
qct_qs = Qct.objects.filter(qctmat__material__id=materialId, tags__contains=tag)
|
qct_qs = Qct.objects.filter(qctmat__material__id=materialId, tags__contains=tag)
|
||||||
if not qct_qs.exists():
|
if not qct_qs.exists():
|
||||||
qct_qs = Qct.objects.filter(tags__contains="default")
|
qct_qs = Qct.objects.filter(name="默认检验表")
|
||||||
return qct_qs
|
return qct_qs
|
||||||
|
|
||||||
class QctTestItem(BaseModel):
|
class QctTestItem(BaseModel):
|
||||||
|
|
|
@ -53,10 +53,15 @@ class QctViewSet(CustomModelViewSet):
|
||||||
|
|
||||||
@action(methods=['post'], detail=False, perms_map={'post': '*'}, serializer_class=QctGetSerializer)
|
@action(methods=['post'], detail=False, perms_map={'post': '*'}, serializer_class=QctGetSerializer)
|
||||||
@transaction.atomic
|
@transaction.atomic
|
||||||
def get_qs(self, request, *args, **kwargs):
|
def get_qct(self, request, *args, **kwargs):
|
||||||
|
"""
|
||||||
|
获取检验模板
|
||||||
|
|
||||||
|
获取检验模板
|
||||||
|
"""
|
||||||
data = request.data
|
data = request.data
|
||||||
qct_qs = Qct.get_qs(data["material"], data["tag"])
|
qct = Qct.get(data["material"], data["tag"])
|
||||||
return QctSerializer(instance=qct_qs, many=True).data
|
return QctSerializer(instance=qct).data
|
||||||
|
|
||||||
|
|
||||||
class QctTestItemViewSet(CustomModelViewSet):
|
class QctTestItemViewSet(CustomModelViewSet):
|
||||||
|
|
Loading…
Reference in New Issue