|
|
@@ -332,14 +332,16 @@ class SerialNumberView(View):
|
|
|
for company in company_qs:
|
|
|
id = company['id']
|
|
|
name = company['name']
|
|
|
- company_serial_qs = CompanySerialModel.objects.filter(status=1, company_id=id).values(
|
|
|
- 'serial_number').order_by('serial_number')
|
|
|
- company_used_qs = company_serial_qs.count()
|
|
|
- serial_list = [item[key] for item in company_serial_qs for key in item]
|
|
|
- last_serial = serial_list[-1] if company_serial_qs.exists() else ''
|
|
|
+ count = CompanySerialModel.objects.filter(status=1, company_id=id).count()
|
|
|
+ # 获取最后一个序列号
|
|
|
+ if count == 0:
|
|
|
+ last_serial = ''
|
|
|
+ else:
|
|
|
+ last_serial = CompanySerialModel.objects.filter(status=1, company_id=id).order_by('-id').values(
|
|
|
+ 'serial_number')[:1][0]['serial_number']
|
|
|
res = {
|
|
|
'name': name,
|
|
|
- 'numbers': company_used_qs,
|
|
|
+ 'numbers': count,
|
|
|
'lastSerial': last_serial
|
|
|
}
|
|
|
company_serial_list.append(res)
|
