Merge branch 'release/V2.4.0'

ccs_base/models/cc_bill_loading.py

@@ -433,7 +433,7 @@ class CcClearanceFile(models.Model):
     file = fields.Binary(string='File')
     # 文件名
     file_name = fields.Char(string='File Name')
-
+    attachment_name = fields.Char(string='File Name')
     # 是否同步
     is_upload = fields.Boolean(string='Is Sync', default=False)
     # 同步时间

ccs_base/models/fetch_mail.py

@@ -8,6 +8,7 @@ from ssl import SSLError
 from socket import gaierror, timeout
 from imaplib import IMAP4, IMAP4_SSL
 from poplib import POP3, POP3_SSL
+from email.header import decode_header
 import email
 from odoo import api, fields, models, tools, _
 from odoo.exceptions import UserError
@@ -122,6 +123,20 @@ class FetchmailServer(models.Model):
                         if a_time > before_now:
                             hdr, sender_email = parseaddr(msg.get('From'))  # 获取发件人邮箱
                             email_body = ''
+                            attachment_arr = []
+                            if msg.is_multipart():
+                                for part in msg.walk():
+                                    # 检查邮件每个部分的内容类型
+                                    content_disposition = str(part.get("Content-Disposition"))
+                                    if "attachment" in content_disposition:
+                                        # 获取附件的文件名
+                                        filename = part.get_filename()
+                                        if filename:
+                                            # 解码文件名
+                                            filename, encoding = decode_header(filename)[0]
+                                            if isinstance(filename, bytes):
+                                                filename = filename.decode(encoding if encoding else "utf-8")
+                                                attachment_arr.append((filename, part.get_payload(decode=True)))
                             for part in msg.walk():
                                 # 如果ture的话内容是没用的
                                 if not part.is_multipart():
@@ -129,8 +144,11 @@ class FetchmailServer(models.Model):
                                     # email_body = part.get_payload(decode=True).decode('utf-8', 'ignore')
                                     email_body = part.get_payload(decode=True).decode('gbk', 'ignore')
                                     break
-                            if email_body:
                             if 'CDS REPORT' in subject.upper():
+                                if attachment_arr:
+                                    rule_obj = self.env['order.state.change.rule'].sudo()
+                                    rule_obj.fetch_mail_dlv_attachment(attachment_arr=attachment_arr)
+                                elif email_body:
                                     rule_obj = self.env['order.state.change.rule'].sudo()
                                     rule_obj.fetch_mail_dlv(email_body=email_body, year=year)
                             imap_server.store(num, '-FLAGS', '\\Seen')

ccs_base/models/order_state_change_rule.py

@@ -6,8 +6,11 @@ from odoo import models, fields, api, _
 from odoo.exceptions import ValidationError, Warning
 import logging
 import json
-import re
+import xlrd
+import base64
+import pdfplumber
 import demjson
+from io import BytesIO
 from datetime import datetime, timedelta
 import re
 _logger = logging.getLogger(__name__)
@@ -42,6 +45,51 @@ class OrderStateChangeRule(models.Model):
     # regular_expression = fields.Char('正则表达式')
     # active = fields.Boolean('有效性', default=True)
 
+    def get_file_path(self, report_file_ids):
+        """
+        得到excel表格的内容
+        :return:
+        """
+        report_path = report_file_ids._full_path(report_file_ids.store_fname)
+        try:
+            if report_file_ids.name[-3:] == 'xls':
+                data = xlrd.open_workbook(report_path, formatting_info=True)
+            elif report_file_ids.name[-3:] in ['pdf', 'PDF']:
+                data = pdfplumber.open(report_path)
+            else:
+                data = xlrd.open_workbook(report_path)
+        except Exception as e:
+            logging.info('解析错误%s' % str(e))
+            f = open(report_path, 'rb')
+            data = f.readlines()
+        return data
+
+    def read_pdf(self, pdf_data):
+        """
+        :param pdf: pdf数据
+        :return:
+        """
+        order_no = ''
+        date_arr = []
+        pdf_data = BytesIO(pdf_data)
+        pdf = pdfplumber.open(pdf_data)
+        for page in pdf.pages:
+            # 获取当前页面的全部文本信息，包括表格中的文字
+            text_p = page.extract_text()
+            text_lines = text_p.split('\n')
+            ze_2 = re.compile("\\d{3}-\\d{8,}")
+            pattern = r'\d{2}/\d{2}/\d{4} \d{2}:\d{2}:\d{2}'
+            # date_obj = datetime.strptime(date_str, '%d/%m/%Y %H:%M:%S')
+            if text_lines:
+                for line in text_lines:
+                    if ze_2.findall(line):
+                        order_no = ze_2.findall(line)[0]
+                    matches = re.findall(pattern, line)
+                    if matches:
+                        date_arr = matches[0]
+        pdf.close()
+        return order_no, date_arr
+
     # 函数处理输出
     def print_match(self, text):
         # 正则表达式
@@ -58,6 +106,45 @@ class OrderStateChangeRule(models.Model):
         data_arr = data_re.findall(email_body)
         return data_arr
 
+    def upload_cds_attachment(self, bl_obj, name, data):
+        file_obj = self.env['cc.clearance.file'].sudo().search([('file_name', '=', '海关CDS申报单(import和授权方式检查拉齐等)'),
+                                                                ('bl_id', '=', bl_obj.id)], limit=1)
+        file_obj.file = base64.encodebytes(data)
+        file_obj.attachment_name = name
+        file_obj.is_upload = False
+        file_obj.action_sync()
+
+    def fetch_mail_dlv_attachment(self, **kwargs):
+        attachment_arr = kwargs['attachment_arr']
+        for attachment_tuple in attachment_arr:
+            try:
+                attachment_name, attachment_data = attachment_tuple
+                order_no, date_str = self.read_pdf(attachment_data)
+                if order_no:
+                    # 转换为 datetime 对象
+                    local_time = datetime.strptime(date_str, '%d/%m/%Y %H:%M:%S')
+                    # 调整时区
+                    users_obj = self.env['res.users'].search([('name', '=', '邮件接收')], limit=1)
+                    tz = users_obj.tz or 'UTC'
+                    timezone_offset = self.env['common.common'].sudo().get_time_zone(tz)
+                    # print(timezone_offset)
+                    utc_time = local_time - timedelta(hours=int(timezone_offset))
+                    sql = "select id from cc_bl where UPPER(REPLACE(REPLACE(REPLACE(bl_no, ' ', ''), '-', ''), '/', '')) = '{0}' order by create_date desc limit 1".format(order_no.replace(' ', '').replace('-', '').replace('/', ''))
+                    self._cr.execute(sql)
+                    result = self._cr.fetchall()
+                    bl_obj = self.env['cc.bl'].sudo().search([('id', '=', result[0][0])]) if result else False
+                    logging.info('order_no:%s, bl_obj: %s' % (order_no, bl_obj))
+                    if bl_obj:
+                        self.upload_cds_attachment(bl_obj, attachment_name, attachment_data)
+                    if bl_obj and bl_obj.state != 'done':
+                        redis_conn = self.env['common.common'].sudo().get_redis()
+                        if redis_conn == 'no':
+                            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")}))
+            except Exception as err:
+                logging.error('fetch_mail_dlv_attachment--error:%s' % str(err))
+
     def fetch_mail_dlv(self, **kwargs):
         email_body = kwargs['email_body']
         year = kwargs['year']

ccs_base/views/cc_clearance_file_view.xml

@@ -11,10 +11,11 @@
             <tree string="Clearance File" decoration-success="is_upload == 1" editable="bottom">
                 <field name="bl_id" string="Bill of Loading" invisible="1"/>
                 <field name="file_name" string="File Name" required="1"/>
-                <field name="file" string="PDF File" required="1"/>
+                <field name="file" string="PDF File" required="1" filename="attachment_name"/>
                 <field name="is_upload" readonly="1"/>
                 <field name="upload_time"/>
                 <button name="action_sync" string="SyncTo.." type="object" icon="fa-upload"/>
+                <field name="attachment_name" invisible="1"/>
             </tree>
         </field>
     </record>