|
@@ -59,6 +59,7 @@ class SerialNumberView(View):
|
|
|
|
|
|
def do_create(self, request_dict, response):
|
|
def do_create(self, request_dict, response):
|
|
quantity = int(request_dict.get('quantity', None))
|
|
quantity = int(request_dict.get('quantity', None))
|
|
|
|
+ p2p = int(request_dict.get('p2p', None))
|
|
|
|
|
|
if not quantity:
|
|
if not quantity:
|
|
return response.json(444)
|
|
return response.json(444)
|
|
@@ -85,7 +86,7 @@ class SerialNumberView(View):
|
|
data = []
|
|
data = []
|
|
now_time = int(time.time())
|
|
now_time = int(time.time())
|
|
for item in tmp:
|
|
for item in tmp:
|
|
- data.append(SerialNumberModel(serial_number=item, add_time=now_time))
|
|
|
|
|
|
+ data.append(SerialNumberModel(serial_number=item, add_time=now_time, p2p=p2p))
|
|
|
|
|
|
if len(data) == 10000:
|
|
if len(data) == 10000:
|
|
SerialNumberModel.objects.bulk_create(data)
|
|
SerialNumberModel.objects.bulk_create(data)
|
|
@@ -167,7 +168,7 @@ class SerialNumberView(View):
|
|
page = int(page)
|
|
page = int(page)
|
|
line = int(line)
|
|
line = int(line)
|
|
|
|
|
|
- serial_qs = SerialNumberModel.objects.filter()
|
|
|
|
|
|
+ serial_qs = SerialNumberModel.objects.filter().order_by('-id')
|
|
|
|
|
|
if serial_number:
|
|
if serial_number:
|
|
serial_qs = serial_qs.filter(serial_number__contains=serial_number)
|
|
serial_qs = serial_qs.filter(serial_number__contains=serial_number)
|
|
@@ -387,11 +388,12 @@ class SerialNumberView(View):
|
|
|
|
|
|
id = request_dict.get('id', None)
|
|
id = request_dict.get('id', None)
|
|
status = request_dict.get('status', None)
|
|
status = request_dict.get('status', None)
|
|
|
|
+ p2p = request_dict.get('p2p', None)
|
|
|
|
|
|
if id and status:
|
|
if id and status:
|
|
serial_number_qs = SerialNumberModel.objects.filter(id=id)
|
|
serial_number_qs = SerialNumberModel.objects.filter(id=id)
|
|
if serial_number_qs.exists():
|
|
if serial_number_qs.exists():
|
|
- serial_number_qs.update(**{'status': status})
|
|
|
|
|
|
+ serial_number_qs.update(**{'status': status, 'p2p': p2p})
|
|
return response.json(0)
|
|
return response.json(0)
|
|
else:
|
|
else:
|
|
return response.json(173)
|
|
return response.json(173)
|