Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop

# Conflicts:
#	sf_message/__manifest__.py

sf_message/models/__init__.py

@@ -6,4 +6,4 @@ from . import sf_message_cam_program
 from . import sf_message_functional_tool_assembly
 from . import sf_message_purchase
 from . import sf_message_workorder
-from . import sf_message_functional_tool_dismantle
+from . import sf_message_functional_tool_dismantle

sf_message/models/sf_message_workorder.py

@@ -39,28 +39,6 @@ class SFMessageWork(models.Model):
                     contents.append(content)
         return contents
 
-    @api.depends('cnc_ids.tool_state')
-    def _compute_tool_state(self):
-        # 将self的id与tool_state进行保存
-        tool_state_dict = {record.id: record.tool_state for record in self}
-        res = super(SFMessageWork, self)._compute_tool_state()
-        data = {'name': []}
-        for record in self:
-            if tool_state_dict[record.id] != '2' and record.tool_state == '2':
-                data['name'].append(record.production_id.programming_no)
-
-        if data['name']:
-            # 请求cloud接口，发送微信消息推送
-            configsettings = self.env['res.config.settings'].get_values()
-            config_header = Common.get_headers(self, configsettings['token'], configsettings['sf_secret_key'])
-            url = '/api/message/invalid_tool_state'
-            config_url = configsettings['sf_url'] + url
-            data['token'] = configsettings['token']
-            ret = requests.post(config_url, json=data, headers=config_header)
-            ret = ret.json()
-            _logger.info('无效用刀异常消息推送接口:%s' % ret)
-        return res
-
     def request_url(self):
         we_config_info = self.env['we.config'].sudo().search([], limit=1)
         redirect_domain = self.env['we.app'].sudo().search([('id', '=', we_config_info.odoo_app_id.id)]).redirect_domain