解决合并冲突

sf_message/models/sf_message_stock_picking.py

@@ -32,10 +32,7 @@ class SFMessageStockPicking(models.Model):
                     if not stock_picking_send:
                         record.add_queue('订单发货提醒')
 
-    def deal_stock_picking_sfp(self, message_queue_ids):  # 处理订单发货提醒
-        contents = []
-        for message_queue_id in message_queue_ids:
-            if message_queue_id.message_template_id.name == '订单发货提醒':
+    def deal_stock_picking_sfp(self, message_queue_id):  # 处理订单发货提醒
         content = message_queue_id.message_template_id.content
         stock_picking = self.env['stock.picking'].search([('id', '=', int(message_queue_id.res_id))])
         stock_picking_out = self.env['stock.picking'].search(
@@ -45,8 +42,7 @@ class SFMessageStockPicking(models.Model):
             url = self.request_url()
             content = content.replace('{{name}}', stock_picking_out.name).replace(
                 '{{sale_order_name}}', stock_picking_out.origin).replace('{{request_url}}', url)
-                    contents.append(content)
-        return contents
+        return content
 
     def _get_message(self, message_queue_ids):
         contents = []
@@ -71,10 +67,11 @@ class SFMessageStockPicking(models.Model):
                         '{{number}}', str(i)).replace('{{request_url}}', url)
                     product_id.append(mrp_production_info.product_id.id)
                     contents.append(content)
+            elif message_queue_id.message_template_id.name == '订单发货提醒':
+                content = self.deal_stock_picking_sfp(message_queue_id)
+                contents.append(content)
             return contents
-            else:
-                res = super(SFMessageStockPicking, self)._get_message(message_queue_id)
-                return res
+
     def get_special_url(self, id, tmplate_name, special_name, model_id):
         menu_id = 0
         action_id = 0