|
|
@@ -751,18 +751,22 @@ class DownloadSerialNumberFileView(View):
|
|
|
updates_serial_number = []
|
|
|
content = ''
|
|
|
now_time = int(time.time())
|
|
|
+ mac_qs = MacModel.objects.filter()
|
|
|
+ mac = mac_qs.values('value')[0]['value']
|
|
|
for i in range(len(sn_qs)):
|
|
|
# print(item)
|
|
|
item = sn_qs[i]
|
|
|
serial_number = item.serial_number
|
|
|
sheet1.write(num, 0, serial_number + mark)
|
|
|
+ sheet1.write(num, 1, mac)
|
|
|
num += 1
|
|
|
+ mac = CommonService.updateMac(mac) # mac地址值+1
|
|
|
content += serial_number.strip() + mark
|
|
|
content += '\n'
|
|
|
|
|
|
serialNumberModel = SerialNumberModel(
|
|
|
id=item.id,
|
|
|
- serial_number = serial_number,
|
|
|
+ serial_number=serial_number,
|
|
|
status=item.status,
|
|
|
use_status=2,
|
|
|
add_time=item.add_time
|
|
|
@@ -777,7 +781,7 @@ class DownloadSerialNumberFileView(View):
|
|
|
OrderSerialNumberModel.objects.bulk_create(updates_serial_number)
|
|
|
updates.clear()
|
|
|
updates_serial_number.clear()
|
|
|
- # print(item['uid__uid'])
|
|
|
+ mac_qs.update(value=mac, update_time=now_time) # 更新mac表数据
|
|
|
|
|
|
if len(updates) > 0:
|
|
|
bulk_update(updates)
|
