|
@@ -225,13 +225,13 @@ class SerialNumberView(View):
|
|
|
for us in us_qs:
|
|
|
sns.append(us['serial_number__serial_number'])
|
|
|
|
|
|
- cs_qs = CompanySerialModel.objects.filter(serial_number__in=sns, status=1).values('serial_number', 'company__secret')
|
|
|
+ cs_qs = CompanySerialModel.objects.filter(serial_number__in=sns, status=1).values('serial_number', 'company__mark')
|
|
|
sns = []
|
|
|
- company = ""
|
|
|
+ mark = ""
|
|
|
if cs_qs.exists():
|
|
|
for cs in cs_qs:
|
|
|
sns.append(cs['serial_number'])
|
|
|
- company = cs_qs[0]['company__secret']
|
|
|
+ mark = cs_qs[0]['company__mark']
|
|
|
|
|
|
sn_qs = SerialNumberModel.objects.filter(serial_number__in=sns)
|
|
|
count = result['num']
|
|
@@ -260,6 +260,6 @@ class SerialNumberView(View):
|
|
|
if save_point:
|
|
|
transaction.savepoint_rollback(save_point) # 事务回滚
|
|
|
redisObject.rpush(key, value)
|
|
|
- return response.json(0, {'serial_number': serial_number + company, 'mac': mac})
|
|
|
+ return response.json(0, {'serial_number': serial_number + mark, 'mac': mac})
|
|
|
else:
|
|
|
return response.json(444)
|