Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/表面工艺外协

# Conflicts:
#	sf_dlm/__manifest__.py
#	sf_dlm/models/product_template.py
#	sf_manufacturing/models/mrp_production.py

sf_base/models/common.py

@@ -1,7 +1,9 @@
 # -*- coding: utf-8 -*-
 import logging
 from odoo import fields, models
-
+import requests
+from odoo.addons.sf_base.commons.common import Common
+from urllib.parse import urlencode
 _logger = logging.getLogger(__name__)
 
 
@@ -17,6 +19,41 @@ class MrsProductionMaterials(models.Model):
     remark = fields.Text("备注")
     active = fields.Boolean('有效', default=True)
 
+    # def open_url_action(self):
+    #     base_url = self.env['ir.config_parameter'].sudo().get_param('web.base.url')
+    #     # url = 'http://192.168.50.202:8080/api'
+    #     url = 'https://bfw.jikimo.com/'
+    #     # data = {
+    #     #     'key' : 'value'
+    #     # }
+    #
+    #     response = requests.get(url)
+    #     response.raise_for_status()
+    #     return {
+    #         'type': 'ir.actions.act_url',
+    #         'url': response.url,
+    #         'target': 'new'
+    #     }
+
+
+
+    def open_url_action(self):
+        # sf_sync_config = self.env['res.config.settings'].get_values()
+        # token = sf_sync_config['token']
+        # sf_secret_key = sf_sync_config['sf_secret_key']
+        # headers = Common.get_headers(self, token, sf_secret_key)
+        url = 'http://192.168.50.127:8081'
+        params = {
+            'user_id': self._uid
+        }
+        url_params = urlencode(params)
+        return {
+            'type': 'ir.actions.act_url',
+            'url': url + '?' + url_params,
+            # 'url': url,
+            'target': 'new'
+        }
+
 
 # 材料型号
 class MrsMaterialModel(models.Model):