Merge branch 'feature/portal-reocr' into feature/uat-tmp

@@ -145,7 +145,7 @@ class Command(BaseCommand, LoggerMixin):
                 self.online_log.warn('{0} [get_doc_info] [doc not exist] [task_str={1}] [is_priority={2}]'.format(
                 self.online_log.warn('{0} [get_doc_info] [doc not exist] [task_str={1}] [is_priority={2}]'.format(
                     self.log_base, task_str, is_priority))
                     self.log_base, task_str, is_priority))
                 return None, None, None, None, None
                 return None, None, None, None, None
-            elif doc.status != DocStatus.INIT.value or (re_ocr_flag == 'Y' and doc.status != DocStatus.PROCESS_FAILED.value):
+            elif (re_ocr_flag == 'N' and doc.status != DocStatus.INIT.value) or (re_ocr_flag == 'Y' and doc.status != DocStatus.PROCESS_FAILED.value):
                 self.online_log.warn('{0} [get_doc_info] [doc status error] [task_str={1}] [is_priority={2}] '
                 self.online_log.warn('{0} [get_doc_info] [doc status error] [task_str={1}] [is_priority={2}] '
                                      '[doc_status={3}]'.format(self.log_base, task_str, is_priority, doc.status))
                                      '[doc_status={3}]'.format(self.log_base, task_str, is_priority, doc.status))
                 return None, None, None, None, None
                 return None, None, None, None, None

@@ -2301,6 +2301,9 @@ class DocReOcrView(GenericView, DocHandler):
 
 
         doc_class, prefix = self.get_doc_class(application_entity)
         doc_class, prefix = self.get_doc_class(application_entity)
         doc = doc_class.objects.filter(id=doc_id).first()
         doc = doc_class.objects.filter(id=doc_id).first()
+        if doc.application_id.startswith(consts.FIXED_APPLICATION_ID_PREFIX):
+            self.running_log.info('[doc re-ocr fail not support CH-S] [application_entity={0}] [doc_id={1}]'.format(application_entity, doc_id))
+            return response.error_msg('模拟下单的文件不支持重新识别')
 
 
         # 3. 选择队列进入
         # 3. 选择队列进入
         is_priority = PriorityApplication.objects.filter(application_id=doc.application_id, on_off=True).exists()
         is_priority = PriorityApplication.objects.filter(application_id=doc.application_id, on_off=True).exists()