|
@@ -160,7 +160,7 @@ class SerialNumberView(View):
|
|
distribution_type = 1 if result['code'] == 0 else 0
|
|
distribution_type = 1 if result['code'] == 0 else 0
|
|
|
|
|
|
# 查询翻新记录
|
|
# 查询翻新记录
|
|
- renovation_logs = SerialNumberRenovateLog.objects.filter(serial_no=serial_number_prefix)
|
|
|
|
|
|
+ renovation_logs = SerialNumberRenovateLog.objects.filter(serial_number=serial_number_prefix)
|
|
current_time = int(time.time())
|
|
current_time = int(time.time())
|
|
|
|
|
|
# 准备插入或更新的参数
|
|
# 准备插入或更新的参数
|
|
@@ -177,8 +177,8 @@ class SerialNumberView(View):
|
|
|
|
|
|
# 获取UID并查询设备信息
|
|
# 获取UID并查询设备信息
|
|
uid = CommonService.get_uid_by_serial_number(serial_number=serial_number_prefix)
|
|
uid = CommonService.get_uid_by_serial_number(serial_number=serial_number_prefix)
|
|
- device_info = Device_Info.objects.filter(UID=uid)
|
|
|
|
- user_name = device_info[0].username if device_info.exists() else ''
|
|
|
|
|
|
+ device_info = Device_Info.objects.filter(UID=uid).values('userID__username')
|
|
|
|
+ user_name = device_info[0]['userID__username'] if device_info.exists() else ''
|
|
user_added = 1 if device_info.exists() else 0
|
|
user_added = 1 if device_info.exists() else 0
|
|
scan_log = 1 if SerialNumberCheckLog.objects.filter(serial_number=serial_number_prefix).exists() else 0
|
|
scan_log = 1 if SerialNumberCheckLog.objects.filter(serial_number=serial_number_prefix).exists() else 0
|
|
|
|
|
|
@@ -255,8 +255,8 @@ class SerialNumberView(View):
|
|
LOGGER.info('翻新入库检查: serial: {}, ip: {}'.format(full_serial_number, ip_address))
|
|
LOGGER.info('翻新入库检查: serial: {}, ip: {}'.format(full_serial_number, ip_address))
|
|
|
|
|
|
# 查询翻新记录和翻新前记录
|
|
# 查询翻新记录和翻新前记录
|
|
- renovation_logs = SerialNumberRenovateLog.objects.filter(serial_no=serial_number_prefix, type=2)
|
|
|
|
- renovation_before_logs = SerialNumberRenovateLog.objects.filter(serial_no=serial_number_prefix, type=1)
|
|
|
|
|
|
+ renovation_logs = SerialNumberRenovateLog.objects.filter(serial_number=serial_number_prefix, type=2)
|
|
|
|
+ renovation_before_logs = SerialNumberRenovateLog.objects.filter(serial_number=serial_number_prefix, type=1)
|
|
|
|
|
|
# 获取当前时间戳
|
|
# 获取当前时间戳
|
|
now_time = int(time.time())
|
|
now_time = int(time.time())
|
|
@@ -273,11 +273,11 @@ class SerialNumberView(View):
|
|
'type': 2
|
|
'type': 2
|
|
}
|
|
}
|
|
|
|
|
|
- # 如果没有翻新记录,则创建新记录
|
|
|
|
|
|
+ # 如果没有入库记录,则创建新记录
|
|
if not renovation_logs.exists():
|
|
if not renovation_logs.exists():
|
|
SerialNumberRenovateLog.objects.create(**insert_or_update_params)
|
|
SerialNumberRenovateLog.objects.create(**insert_or_update_params)
|
|
else:
|
|
else:
|
|
- # 如果存在翻新记录,则更新操作计数和更新时间
|
|
|
|
|
|
+ # 如果存在入库记录,则更新操作计数和更新时间
|
|
renovation_logs.update(operation_count=renovation_logs[0].operation_count + 1, updated_time=now_time)
|
|
renovation_logs.update(operation_count=renovation_logs[0].operation_count + 1, updated_time=now_time)
|
|
|
|
|
|
# 获取翻新前记录的操作计数
|
|
# 获取翻新前记录的操作计数
|