api/admin_views.py

@@ -24,12 +24,12 @@ def querysn(request):

                         return response(ProductBrandStatusCode.BRAND_NOT_MATCH)
              

                 
              

                     try:
              

                -        log = ConsumeInfoSubmitLogInfo.objects.get(brand_id=brand_id, model_id=model_id, serialNo=sn, submit_during_activity=True)
              

                +        log = ConsumeInfoSubmitLogInfo.objects.get(brand_id=brand_id, model_id=model_id, serialNo=sn, submit_during_activity=True, has_used=False)
              

                     except ConsumeInfoSubmitLogInfo.DoesNotExist:
              

                         log = None
              

                 
              

                     if not log:
              

                -        log = ConsumeInfoSubmitLogInfo.objects.filter(brand_id=brand_id, model_id=model_id, serialNo=sn).order_by('dupload').first()
              

                +        log = ConsumeInfoSubmitLogInfo.objects.filter(brand_id=brand_id, model_id=model_id, serialNo=sn).order_by('-submit_during_activity', 'dupload').first()
              

                 
              

                     if not log:
              

                         return response(ProductMachineStatusCode.SN_NOT_FOUND)