Accept Merge Request #1356: (feature/销售和排程添加消息推送 -> develop)

Merge Request: 消息推送

Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1356?initial=true

sf_message/models/sf_message_functional_tool_dismantle.py

@@ -8,7 +8,11 @@ class SFMessagefunctionalToolDismantle(models.Model):
 
     @api.model
     def create(self, vals):
+        # 判断是否为web页面创建请求
+        is_web_request = self.env.context.get('params', False)
         result = super(SFMessagefunctionalToolDismantle, self).create(vals)
+        if is_web_request and is_web_request.get('menu_id', False):
+            return result
         for obj in result:
             if  obj.dismantle_cause in ['寿命到期报废', '崩刀报废']and obj.state=='待拆解':
                 obj.add_queue('功能刀具寿命到期')

sf_message/models/sf_message_stock_picking.py

@@ -7,11 +7,14 @@ class SFMessageStockPicking(models.Model):
     _description = "库存调拨"
     _inherit = ['stock.picking', 'jikimo.message.dispatch']
 
-    def button_validate(self):
-        res = super(SFMessageStockPicking, self).button_validate()
-        if self.location_id.name == 'Vendors' and self.location_dest_id.name == '进货':
-            self.add_queue('调拨入库')
-        return res
+    @api.model_create_multi
+    def create(self, vals):
+        result = super(SFMessageStockPicking, self).create(vals)
+        for obj in result:
+            if obj.location_id.name == '进货' and obj.location_dest_id.name == '刀具房':
+                obj.add_queue('调拨入库')
+        return result
+
 
     @api.depends('move_type', 'immediate_transfer', 'move_ids.state', 'move_ids.picking_id')
     def _compute_state(self):