|
|
@@ -689,7 +689,10 @@ class DownloadSerialNumberFileView(View):
|
|
|
if fileType == 'txt':
|
|
|
# return self.download_txt(uid_values, uid_qs, order)
|
|
|
# return self.download_excel(uid_values, order)
|
|
|
- return self.download_zip(sn_qs, order)
|
|
|
+ fileTypeName = 'chenyun'
|
|
|
+ if area == 2:
|
|
|
+ fileTypeName = 'tutk'
|
|
|
+ return self.download_zip(sn_qs, order , fileTypeName )
|
|
|
else:
|
|
|
return response.json(444, 'fileType')
|
|
|
else:
|
|
|
@@ -698,15 +701,15 @@ class DownloadSerialNumberFileView(View):
|
|
|
return response.json(444, '222')
|
|
|
|
|
|
|
|
|
- def download_zip(self, sn_qs, order):
|
|
|
+ def download_zip(self, sn_qs, order , fileTypeName):
|
|
|
dir_name = 'static/' + time.strftime('%Y_%m_%d_%H_%M_%S', time.localtime())
|
|
|
path = '/'.join((BASE_DIR, dir_name)).replace('\\', '/') + '/'
|
|
|
if not os.path.exists(path):
|
|
|
os.mkdir(path)
|
|
|
|
|
|
filename = time.strftime('_%Y_%m_%d_%H_%M_%S', time.localtime())
|
|
|
- txt_filename = 'SerialNumber' + filename + '.txt'
|
|
|
- excel_filename = 'SerialNumber' + filename + '.xls'
|
|
|
+ txt_filename = 'SerialNumber' + fileTypeName +'_'+ filename + '.txt'
|
|
|
+ excel_filename = 'SerialNumber' + fileTypeName + '_' + filename + '.xls'
|
|
|
|
|
|
txt_file = open(path + txt_filename, 'w+')
|
|
|
workbook = xlwt.Workbook(encoding='utf-8')
|
|
|
@@ -720,7 +723,7 @@ class DownloadSerialNumberFileView(View):
|
|
|
for i in range(len(sn_qs)):
|
|
|
# print(item)
|
|
|
item = sn_qs[i]
|
|
|
- serial_number = item.serial_number
|
|
|
+ serial_number = item.serial_number + '11A'
|
|
|
sheet1.write(num, 0, serial_number)
|
|
|
num += 1
|
|
|
content += serial_number.strip()
|
|
|
@@ -728,7 +731,7 @@ class DownloadSerialNumberFileView(View):
|
|
|
|
|
|
serialNumberModel = SerialNumberModel(
|
|
|
id=item.id,
|
|
|
- serial_number = item.serial_number,
|
|
|
+ serial_number = serial_number,
|
|
|
status=item.status,
|
|
|
use_status=2,
|
|
|
p2p=item.p2p,
|
|
|
@@ -761,9 +764,9 @@ class DownloadSerialNumberFileView(View):
|
|
|
workbook.save(path + excel_filename)
|
|
|
|
|
|
zip_name = path[0:path.rfind('/')] + '.zip'
|
|
|
- return self.get_zip(path, os.listdir(path), zip_name)
|
|
|
+ return self.get_zip(path, os.listdir(path), zip_name , fileTypeName)
|
|
|
|
|
|
- def get_zip(self, path, files, zip_name):
|
|
|
+ def get_zip(self, path, files, zip_name, fileTypeName ):
|
|
|
zp = zipfile.ZipFile(zip_name, 'w', zipfile.ZIP_DEFLATED)
|
|
|
for file in files:
|
|
|
zp.write(filename=(path + file), arcname=str(file))
|
|
|
@@ -771,6 +774,6 @@ class DownloadSerialNumberFileView(View):
|
|
|
|
|
|
response = StreamingHttpResponse(open(zip_name, 'rb'))
|
|
|
response['content_type'] = "application/octet-stream"
|
|
|
- response['Content-Disposition'] = 'attachment; filename=SerialNumber' + time.strftime('_%Y_%m_%d_%H_%M_%S',
|
|
|
+ response['Content-Disposition'] = 'attachment; filename=SerialNumber_'+ fileTypeName + time.strftime('_%Y_%m_%d_%H_%M_%S',
|
|
|
time.localtime()) + '.zip'
|
|
|
return response
|
