Merge remote-tracking branch 'origin/feature/销售和排程添加消息推送' into feature/销售和排程添加消息推送

sf_message/models/sf_message_functional_tool_assembly.py

@@ -9,10 +9,7 @@ class SFMessagefunctionalToolAssembly(models.Model):
     @api.model_create_multi
     def create(self, vals):
         result = super(SFMessagefunctionalToolAssembly, self).create(vals)
-        is_cam = False
         for obj in result:
             if obj.loading_task_source == '0' and obj.assemble_status == '0':
-                is_cam = True
-        if is_cam:
-            self.add_queue('功能刀具组装')
+                obj.add_queue('功能刀具组装')
         return result

sf_message/models/sf_message_functional_tool_dismantle.py

@@ -6,13 +6,9 @@ class SFMessagefunctionalToolDismantle(models.Model):
     _description = "刀具拆解单"
     _inherit = ['sf.functional.tool.dismantle', 'jikimo.message.dispatch']
 
-    @api.model
     def create(self, vals):
         result = super(SFMessagefunctionalToolDismantle, self).create(vals)
-        is_dismantle = False
         for obj in result:
             if  obj.dismantle_cause in ['寿命到期报废', '崩刀报废']and obj.state=='待拆解':
-                is_dismantle = True
-        if is_dismantle:
-            self.add_queue('功能刀具寿命到期')
+                obj.add_queue('功能刀具寿命到期')
         return result