From c3e40fd3aa85129e1feabd4705f843536f6df58a Mon Sep 17 00:00:00 2001 From: hujiaying Date: Fri, 11 Oct 2024 09:52:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B6=88=E6=81=AF=E5=8F=91?= =?UTF-8?q?=E9=80=81=E5=89=8D=E5=B7=B2=E5=85=A5=E5=BA=93=E6=88=96=E5=B7=B2?= =?UTF-8?q?=E5=8F=91=E8=B4=A7=E6=B6=88=E6=81=AF=E5=8F=91=E9=80=81=E5=86=85?= =?UTF-8?q?=E5=AE=B9=E4=B8=BAnull?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_message/data/template_data.xml | 2 +- sf_message/models/sf_message_stock_picking.py | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/sf_message/data/template_data.xml b/sf_message/data/template_data.xml index 1db9031a..fd5ba389 100644 --- a/sf_message/data/template_data.xml +++ b/sf_message/data/template_data.xml @@ -130,7 +130,7 @@ normal ### 订单发货提醒： 单号：发料出库单[{{name}}]({{request_url}}) -事项：销售订单{{sale_order_name}}已全部产出并出库，请及时发货 +事项：销售订单{{sale_order_name}}已全部产出并入库，请及时发货 \ No newline at end of file diff --git a/sf_message/models/sf_message_stock_picking.py b/sf_message/models/sf_message_stock_picking.py index b673dbe0..d98b475f 100644 --- a/sf_message/models/sf_message_stock_picking.py +++ b/sf_message/models/sf_message_stock_picking.py @@ -33,12 +33,13 @@ class SFMessageStockPicking(models.Model): record.add_queue('订单发货提醒') def deal_stock_picking_sfp(self, message_queue_id): # 处理订单发货提醒 - content = message_queue_id.message_template_id.content + content = None stock_picking = self.env['stock.picking'].search([('id', '=', int(message_queue_id.res_id))]) stock_picking_out = self.env['stock.picking'].search( [('origin', '=', stock_picking.origin), ('state', '=', 'assigned'), ('picking_type_id.sequence_code', '=', 'OUT')]) if stock_picking_out and len(stock_picking_out) > 0: + content = message_queue_id.message_template_id.content url = self.request_url() content = content.replace('{{name}}', stock_picking_out.name).replace( '{{sale_order_name}}', stock_picking_out.origin).replace('{{request_url}}', url) @@ -69,7 +70,8 @@ class SFMessageStockPicking(models.Model): contents.append(content) elif message_queue_id.message_template_id.name == '订单发货提醒': content = self.deal_stock_picking_sfp(message_queue_id) - contents.append(content) + if content: + contents.append(content) return contents def get_special_url(self, id, tmplate_name, special_name, model_id):