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

@@ -1358,9 +1358,6 @@ class Command(BaseCommand, LoggerMixin):
                 pwd_list = get_pwd_list_from_str(doc.document_name, doc.password)
                 pwd_list = get_pwd_list_from_str(doc.document_name, doc.password)
                 pdf_handler = PDFHandler(pdf_path, img_save_path, doc.document_name, pwd_list=pwd_list)
                 pdf_handler = PDFHandler(pdf_path, img_save_path, doc.document_name, pwd_list=pwd_list)
 
 
-                if classify_1_str == '0':
-                    try:
-                        # 2. 从EDMS获取PDF文件
                 try:
                 try:
                     max_count_obj = Configs.objects.filter(id=6).first()
                     max_count_obj = Configs.objects.filter(id=6).first()
                     max_img_count = int(max_count_obj.value)
                     max_img_count = int(max_count_obj.value)
@@ -1369,6 +1366,10 @@ class Command(BaseCommand, LoggerMixin):
                     self.online_log.info('{0} [get max_img_count fail] [task={1}]'.format(self.log_base, task_str))
                     self.online_log.info('{0} [get max_img_count fail] [task={1}]'.format(self.log_base, task_str))
                 self.online_log.info('{0} [max_img_count] [task={1}] [max_img_count={2}]'.format(self.log_base, task_str, max_img_count))
                 self.online_log.info('{0} [max_img_count] [task={1}] [max_img_count={2}]'.format(self.log_base, task_str, max_img_count))
 
 
+                if classify_1_str == '0':
+                    try:
+                        # 2. 从EDMS获取PDF文件
+
                         for times in range(consts.RETRY_TIMES):
                         for times in range(consts.RETRY_TIMES):
                             try:
                             try:
                                 if doc.application_id.startswith(consts.FIXED_APPLICATION_ID_PREFIX):
                                 if doc.application_id.startswith(consts.FIXED_APPLICATION_ID_PREFIX):
@@ -1512,7 +1513,6 @@ class Command(BaseCommand, LoggerMixin):
                             # return
                             # return
                 elif classify_1_str == '12' or classify_1_str == '29': # weixin e-bs 或e-invoice 都走微信电子流水逻辑
                 elif classify_1_str == '12' or classify_1_str == '29': # weixin e-bs 或e-invoice 都走微信电子流水逻辑
                     try:
                     try:
-                        max_img_count = 500
                         for times in range(consts.RETRY_TIMES):
                         for times in range(consts.RETRY_TIMES):
                             try:
                             try:
                                 if doc.application_id.startswith(consts.FIXED_APPLICATION_ID_PREFIX):
                                 if doc.application_id.startswith(consts.FIXED_APPLICATION_ID_PREFIX):