|
@@ -10,7 +10,7 @@ from django.db.models import Count
|
|
|
from django.views import View
|
|
|
|
|
|
from Model.models import SerialNumberModel, UserModel, UserSerialNumberModel, CompanySerialModel, \
|
|
|
- MacModel, LogModel, CompanyModel
|
|
|
+ MacModel, LogModel, CompanyModel, SerialMac
|
|
|
from Object.RedisObject import RedisObject
|
|
|
from Object.ResponseObject import ResponseObject
|
|
|
from Object.S3Email import S3Email
|
|
@@ -594,9 +594,11 @@ class SerialNumberView(View):
|
|
|
SerialNumberModel.objects.filter(serial_number=serial_number).update(use_status=2, add_time=now_time)
|
|
|
CompanySerialModel.objects.filter(serial_number=serial_number).update(status=2, update_time=now_time)
|
|
|
LogModel.objects.create(**log)
|
|
|
+ serial_number = serial_number + company_mark
|
|
|
+ SerialMac.objects.create(serial_number=serial_number, mac=mac, add_time=now_time)
|
|
|
|
|
|
redis_obj.del_data(key=serial_operate_lock_key) # redis解锁
|
|
|
- return response.json(0, {'serial_number': serial_number + company_mark, 'mac': mac})
|
|
|
+ return response.json(0, {'serial_number': serial_number, 'mac': mac})
|
|
|
except Exception as e:
|
|
|
redis_obj.del_data(key=serial_operate_lock_key) # redis解锁
|
|
|
return response.json(500, repr(e))
|