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 @@
             <field name="urgency">normal</field>
             <field name="content">### 订单发货提醒：
 单号：发料出库单[{{name}}]({{request_url}})
-事项：销售订单{{sale_order_name}}已全部产出并出库，请及时发货</field>
+事项：销售订单{{sale_order_name}}已全部产出并入库，请及时发货</field>
         </record>
     </data>
 </odoo>
\ 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):