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

# Conflicts:
#	sf_message/__manifest__.py
#	sf_message/models/sf_message_workorder.py

sf_message/models/sf_message_workorder.py

@@ -1,5 +1,10 @@
 from odoo import models, fields, api, _
+import logging, json
+import requests
+from odoo.addons.sf_base.commons.common import Common
+from urllib.parse import urlencode
 
+_logger = logging.getLogger(__name__)
 
 class SFMessageWork(models.Model):
     _name = 'mrp.workorder'
@@ -10,7 +15,10 @@ class SFMessageWork(models.Model):
         super(SFMessageWork, self)._compute_state()
         for workorder in self:
             if workorder.state == 'ready' and workorder.routing_type == '装夹预调':
-                workorder.add_queue('工单已下发通知')
+                jikimo_message_queue = self.env['jikimo.message.queue'].sudo().search(
+                    [('res_id', '=', workorder.id), ("message_status", "=", "pending")])
+                if not jikimo_message_queue:
+                    workorder.add_queue('工单已下发通知')
 
     def _get_message(self, message_queue_ids):
         contents = []
@@ -23,15 +31,48 @@ class SFMessageWork(models.Model):
                     [('product_id', '=', mrp_workorder_line.product_id.id), ('state', '=', 'ready'),
                      ('routing_type', '=', '装夹预调')])
                 if len(mrp_workorder_list) > 0 and mrp_workorder_line.product_id.id not in product_id:
-                    url = message_queue_id.message_template_id.get_url(int(message_queue_id.res_id)) + "&active_id=1"
+                    url = self.request_url()
                     content = content.replace('{{product_id}}', mrp_workorder_line.product_id.name).replace(
                         '{{number}}', str(len(mrp_workorder_list))).replace(
-                        '{{part_number}}',
-                        mrp_workorder_line.part_number if mrp_workorder_line.part_number else "").replace(
                         '{{request_url}}', url)
                     product_id.append(mrp_workorder_line.product_id.id)
                     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
+        full_url = 'https://%s/' % redirect_domain
+        action_id = self.env.ref('sf_manufacturing.mrp_workorder_action_tablet').id
+        menu_id = self.env['ir.model.data'].search([('name', '=', 'module_stock_dropshipping')]).id
+        # 查询参数
+        params = {'menu_id': menu_id, 'action': action_id, 'model': 'mrp.workorder',
+                  'view_type': 'list', 'active_id': 1}
+        # 拼接查询参数
+        query_string = urlencode(params)
+        # 拼接URL
+        full_url = full_url + "web#" + query_string
+        return full_url