Merge branch 'develop' into feature/ocr识别pdf并删除指定内容

ccs_base/models/order_state_change_rule.py

@@ -259,11 +259,13 @@ class OrderStateChangeRule(models.Model):
         # order_obj_arr = []
         try:
             text_arr = [i.replace('-', '').replace(' ', '') for i in text_arr]
+            ids = []
+            if text_arr:
                 sql = "select id from cc_bl where UPPER(REPLACE(REPLACE(REPLACE(bl_no, ' ', ''), '-', ''), '/', '')) in %s"
                 self._cr.execute(sql, (tuple(text_arr),))
                 result = self._cr.fetchall()
                 ids = [i[0] for i in result]
-            bl_objs = self.env['cc.bl'].sudo().search([('id', 'in', ids)]) if result else False
+            bl_objs = self.env['cc.bl'].sudo().search([('id', 'in', ids)]) if ids else False
             if bl_objs and attachment_tuple_arr:
                 file_objs = self.env['cc.clearance.file'].sudo().search(
                     [('file_name', '=', '尾程交接POD(待大包数量和箱号)'),
@@ -277,6 +279,28 @@ class OrderStateChangeRule(models.Model):
                 #     raise ValidationError('未连接redis')
                 # else:
                 #     redis_conn.lpush('mail_push_package_list', json.dumps({'id': bl_obj.id, 'utc_time': utc_time.strftime("%Y-%m-%d %H:%M:%S")}))
+            if not bl_objs:
+                mail_time = (datetime.utcnow() + timedelta(hours=8)).strftime("%Y-%m-%d %H:%M:%S")
+                content = f"""<p>您好：
+                邮箱在{mail_time}(+8)时间接收到主题为POD的邮件，但未识别到对应的提单，请检查
+                避免推送超时！</p>"""
+                # 给客户配置的每个邮箱都发送邮件
+                patrol_sender_email = self.env["ir.config_parameter"].sudo().get_param('patrol_sender_email') or ''
+                patrol_receiver_emails = self.env["ir.config_parameter"].sudo().get_param(
+                    'patrol_receiver_emails') or ''
+                mail = self.env['mail.mail'].sudo().create({
+                    "email_from": patrol_sender_email,
+                    'subject': 'POD邮件未提取到提单',
+                    'body_html': content,
+                    'email_to': patrol_receiver_emails
+                    # 'email_to': "1663490807@qq.com,820656583@qq.com"
+                })
+                mail.send()
+                for i in range(2):
+                    if mail.failure_reason:
+                        logging.info('邮件发送失败原因:%s' % mail.failure_reason)
+                        mail.write({'state': 'outgoing'})
+                        mail.send()
         except Exception as err:
             logging.error('fetch_final_mail_dlv--error:%s' % str(err))