Merge branch 'refs/heads/feature/程序用刀异常提醒' into feature/销售和排程添加消息推送

# Conflicts:
#	sf_message/models/sf_message_workorder.py

sf_message/__manifest__.py

@@ -11,7 +11,7 @@
     """,
     'category': 'sf',
     'website': 'https://www.sf.jikimo.com',
-    'depends': ['sale', 'purchase', 'sf_plan', 'jikimo_message_notify','stock','sf_tool_management'],
+    'depends': ['sale', 'purchase', 'sf_plan', 'jikimo_message_notify','stock', 'sf_tool_management', 'sf_manufacturing', 'sf_hr'],
     'data': [
         'data/bussiness_node.xml',
     ],

sf_message/models/sf_message_sale.py

@@ -41,12 +41,20 @@ class SFMessageSale(models.Model):
     # 继承并重写jikimo.message.dispatch的_get_message()
     def _get_message(self, message_queue_ids):
         res = super(SFMessageSale, self)._get_message(message_queue_ids)
-        if message_queue_ids.message_template_id.bussiness_node_id.name == '确认接单':
-            # sale_order = self.env['sale.order'].search([('id', '=', message_queue_ids.model.res_id)])
-            sale_order_line = self.env['sale.order.line'].search([('order_id', '=', int(message_queue_ids.res_id))])
-            if len(sale_order_line) == 1:
-                product = sale_order_line[0].product_id.name
-            elif len(sale_order_line) > 1:
-                product = '%s...' % sale_order_line[0].product_id.name
-            res[0] = res[0].replace('{{product_id}}', product)
+        new_res = []
+        processed_messages = set()  # 用于跟踪已经处理过的消息
+        for item in message_queue_ids:
+            if item.message_template_id.bussiness_node_id.name == '确认接单':
+                sale_order_line = self.env['sale.order.line'].search([('order_id', '=', int(item.res_id))])
+                if len(sale_order_line) == 1:
+                    product = sale_order_line[0].product_id.name
+                elif len(sale_order_line) > 1:
+                    product = '%s...' % sale_order_line[0].product_id.name
+                for message in res:
+                    message_text = message.replace('{{product_id}}', product)
+                    if message_text not in processed_messages:
+                        new_res.append(message_text)
+                        processed_messages.add(message_text)
+        if new_res:
+            res = new_res
         return res

sf_message/models/sf_message_workorder.py

@@ -1,6 +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'
@@ -35,6 +39,28 @@ 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