|
|
@@ -635,7 +635,6 @@ class DownloadSerialNumberFileView(View):
|
|
|
|
|
|
def validate(self, request_dict):
|
|
|
token = request_dict.get('token', None)
|
|
|
- area = request_dict.get('area', None)
|
|
|
quantity = int(request_dict.get('quantity', None))
|
|
|
fileType = request_dict.get('fileType', None)
|
|
|
order_number = request_dict.get('order_number', None)
|
|
|
@@ -653,12 +652,12 @@ class DownloadSerialNumberFileView(View):
|
|
|
if token.code != 0:
|
|
|
return response.json(token.code)
|
|
|
|
|
|
- if not area or not order_number or not board or not plan or not checksum or not ic_model or not order_quantity or not fileType or not company_id:
|
|
|
+ if not order_number or not board or not plan or not checksum or not ic_model or not order_quantity or not fileType or not company_id:
|
|
|
return response.json(444)
|
|
|
|
|
|
- area = int(area)
|
|
|
|
|
|
- if area >= 0 and quantity > 0:
|
|
|
+
|
|
|
+ if quantity > 0:
|
|
|
|
|
|
# 保存订单信息
|
|
|
now_time = int(time.time())
|
|
|
@@ -694,7 +693,7 @@ class DownloadSerialNumberFileView(View):
|
|
|
for us in us_qs:
|
|
|
sns.append(us['serial_number__serial_number'])
|
|
|
|
|
|
- cs_qs = CompanySerialModel.objects.filter(serial_number__in=sns, status=1).values('serial_number')
|
|
|
+ cs_qs = CompanySerialModel.objects.filter(serial_number__in=sns, status=1, company__secret=company_id).values('serial_number', 'company__mark')
|
|
|
sns = []
|
|
|
mark = ""
|
|
|
if cs_qs.exists():
|
|
|
@@ -713,9 +712,7 @@ class DownloadSerialNumberFileView(View):
|
|
|
if fileType == 'txt':
|
|
|
# return self.download_txt(uid_values, uid_qs, order)
|
|
|
# return self.download_excel(uid_values, order)
|
|
|
- fileTypeName = 'chenyun'
|
|
|
- if area == 2:
|
|
|
- fileTypeName = 'tutk'
|
|
|
+ fileTypeName = 'NewFile'
|
|
|
return self.download_zip(sn_qs, order , fileTypeName, mark)
|
|
|
else:
|
|
|
return response.json(444, 'fileType')
|
