|
|
@@ -15,7 +15,7 @@ from django.utils.decorators import method_decorator
|
|
|
from django.views.decorators.csrf import csrf_exempt
|
|
|
from django.views.generic.base import View
|
|
|
|
|
|
-from Model.models import CompanyModel, SerialNumberModel, VPGModel, UIDModel, UIDCompanySerialModel, CompanySerialModel, \
|
|
|
+from Model.models import CompanyModel, VPGModel, UIDModel, UIDCompanySerialModel, CompanySerialModel, \
|
|
|
LogModel
|
|
|
from Object.ResponseObject import ResponseObject
|
|
|
from Object.TokenObject import TokenObject
|
|
|
@@ -182,7 +182,7 @@ class SerialView(View):
|
|
|
if not company_serial_qs.exists():
|
|
|
return response.json(0, {'list': '', 'total': 0})
|
|
|
total = company_serial_qs.count()
|
|
|
- serial_number_page = company_serial_qs.order_by('-serial_number')[(page - 1) * line:page * line].\
|
|
|
+ serial_number_page = company_serial_qs.order_by('-serial_number')[(page - 1) * line:page * line]. \
|
|
|
values('serial_number', 'company__name', 'status', 'add_time', 'update_time')
|
|
|
return response.json(0, {'list': list(serial_number_page), 'total': total})
|
|
|
except Exception as e:
|
|
|
@@ -249,6 +249,8 @@ class SerialView(View):
|
|
|
if uid_company_serial_qs.exists():
|
|
|
uid_id = uid_company_serial_qs[0]['uid_id']
|
|
|
query = query.filter(id=uid_id)
|
|
|
+ else:
|
|
|
+ return response.json(0, {'list': '', 'total': 0})
|
|
|
if vpg_id:
|
|
|
query = query.filter(vpg_id=int(vpg_id))
|
|
|
if status:
|
