|
@@ -494,8 +494,15 @@ class SerialNumberView(View):
|
|
|
serial_number = company_serial_qs.serial_number
|
|
|
company_mark = company_serial_qs.company.mark
|
|
|
|
|
|
- # user_id=4: 13800138003子账号
|
|
|
- user_serial_number_qs = UserSerialNumberModel.objects.filter(user__id=4,
|
|
|
+ # 查询序列号管理员账号
|
|
|
+ user_qs = UserModel.objects.filter(permission=2).values('id')
|
|
|
+ if not user_qs.exists():
|
|
|
+ redis_obj.del_data(key=serial_operate_lock_key) # redis解锁
|
|
|
+ return response.json(9)
|
|
|
+ user_id = user_qs[0]['id']
|
|
|
+
|
|
|
+ # 查询是否还有未使用的序列号
|
|
|
+ user_serial_number_qs = UserSerialNumberModel.objects.filter(user__id=user_id,
|
|
|
serial_number__serial_number=serial_number,
|
|
|
serial_number__use_status=1)
|
|
|
if not user_serial_number_qs.exists():
|