|
|
@@ -24,12 +24,12 @@ def querysn(request):
|
24
|
24
|
return response(ProductBrandStatusCode.BRAND_NOT_MATCH)
|
25
|
25
|
|
26
|
26
|
try:
|
27
|
|
- log = ConsumeInfoSubmitLogInfo.objects.get(brand_id=brand_id, model_id=model_id, serialNo=sn, submit_during_activity=True)
|
|
27
|
+ log = ConsumeInfoSubmitLogInfo.objects.get(brand_id=brand_id, model_id=model_id, serialNo=sn, submit_during_activity=True, has_used=False)
|
28
|
28
|
except ConsumeInfoSubmitLogInfo.DoesNotExist:
|
29
|
29
|
log = None
|
30
|
30
|
|
31
|
31
|
if not log:
|
32
|
|
- log = ConsumeInfoSubmitLogInfo.objects.filter(brand_id=brand_id, model_id=model_id, serialNo=sn).order_by('dupload').first()
|
|
32
|
+ log = ConsumeInfoSubmitLogInfo.objects.filter(brand_id=brand_id, model_id=model_id, serialNo=sn).order_by('-submit_during_activity', 'dupload').first()
|
33
|
33
|
|
34
|
34
|
if not log:
|
35
|
35
|
return response(ProductMachineStatusCode.SN_NOT_FOUND)
|