From 3cbd1140bb53a783c7e5cb635a8b00cece25fc3d Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Tue, 22 Nov 2022 10:20:18 +0800
Subject: [PATCH] =?UTF-8?q?mrs=E4=B8=BA=E5=90=8D=E7=9A=84=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BAsf?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_base/commons/common.py                 |  8 ++++----
 sf_base/models/common.py                  |  2 +-
 sf_dlm/__manifest__.py                    |  2 +-
 sf_dlm/models/product_template.py         |  4 ++--
 sf_dlm/views/product_template_view.xml    | 10 +++++-----
 sf_manufacturing/models/mrp_workcenter.py |  4 ++--
 sf_manufacturing/models/mrp_workorder.py  |  8 ++++----
 sf_mrs_connect/controllers/controllers.py |  2 +-
 8 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/sf_base/commons/common.py b/sf_base/commons/common.py
index abdbeb10..f99d6563 100644
--- a/sf_base/commons/common.py
+++ b/sf_base/commons/common.py
@@ -13,16 +13,16 @@ class Common(models.Model):
 
 
 
-    def get_headers(self,token,mrs_secret_key):
+    def get_headers(self,token, secret_key):
         '''
         获取requests中的heardes参数
         '''
         timestamp = int(time.time())
-        check_str = '%s%s%s' % (token, timestamp, mrs_secret_key)
-        check_mrs_str = hashlib.sha1(check_str.encode('utf-8')).hexdigest()
+        check_str = '%s%s%s' % (token, timestamp, secret_key)
+        check_sf_str = hashlib.sha1(check_str.encode('utf-8')).hexdigest()
         headers = {'TOKEN': token,
                    'TIMESTAMP': str(timestamp),
-                   'checkstr': check_mrs_str}
+                   'checkstr': check_sf_str}
         return headers
 
 
diff --git a/sf_base/models/common.py b/sf_base/models/common.py
index 01465284..809b8be0 100644
--- a/sf_base/models/common.py
+++ b/sf_base/models/common.py
@@ -66,7 +66,7 @@ class MrsProcessingOrder(models.Model):
 
     processing_technology_ids = fields.Many2many('sf.processing.technology', 'sf_associated_processes',
                                                  index=True, string='加工工艺')
-    production_process_id = fields.Many2one('mrs.production.process', string="表面工艺")
+    production_process_id = fields.Many2one('sf.production.process', string="表面工艺")
 
 
 class Tray(models.Model):
diff --git a/sf_dlm/__manifest__.py b/sf_dlm/__manifest__.py
index 1d608861..aabf049d 100644
--- a/sf_dlm/__manifest__.py
+++ b/sf_dlm/__manifest__.py
@@ -12,7 +12,7 @@
     'website': 'https://www.sf.jikimo.com',
     'depends': ['product', 'base'],
     'data': [
-        # 'data/product_data.xml',
+        'data/product_data.xml',
         'views/product_template_view.xml'
     ],
     'demo': [
diff --git a/sf_dlm/models/product_template.py b/sf_dlm/models/product_template.py
index 077af0bc..470eff03 100644
--- a/sf_dlm/models/product_template.py
+++ b/sf_dlm/models/product_template.py
@@ -49,9 +49,9 @@ class ResProductTemplate(models.Model):
                 [('materials_no', '=', item['texture_code'])]).id,
             'materials_type_id': self.env['sf.materials.model'].search(
                 [('materials_no', '=', item['texture_type_code'])]).id,
-            # 'model_surface_process_id': self.env['mrs.production.process'].search(
+            # 'model_surface_process_id': self.env['sf.production.process'].search(
             #     [('process_encode', '=', item['surface_process_code'])]).id,
-            # 'model_process_parameters_id': self.env['mrs.processing.technology'].search(
+            # 'model_process_parameters_id': self.env['sf.processing.technology'].search(
             #     [('process_encode', '=', item['process_parameters_code'])]).id,
             'model_remark': item['remark'],
             'default_code': '%s-%s' % (order_number, i),
diff --git a/sf_dlm/views/product_template_view.xml b/sf_dlm/views/product_template_view.xml
index 83d70cfa..e6e670b5 100644
--- a/sf_dlm/views/product_template_view.xml
+++ b/sf_dlm/views/product_template_view.xml
@@ -6,11 +6,11 @@
             <field name="model">product.template</field>
             <field name="inherit_id" ref="product.product_template_only_form_view"/>
             <field name="arch" type="xml">
-                <field name="invoice_policy" position="after">
-                    <field name="materials_id" string="材料"/>
-                    <field name="materials_type_id" string="型号"
-                           domain="[('materials_id', '=', materials_id)]"/>
-                </field>
+<!--                <field name="invoice_policy" position="after">-->
+<!--                    <field name="materials_id" string="材料"/>-->
+<!--                    <field name="materials_type_id" string="型号"-->
+<!--                           domain="[('materials_id', '=', materials_id)]"/>-->
+<!--                </field>-->
 
                 <xpath expr="//label[@for='volume']" position="before">
                     <label for="long" string="尺寸"
diff --git a/sf_manufacturing/models/mrp_workcenter.py b/sf_manufacturing/models/mrp_workcenter.py
index 8e446f7c..f5e36b68 100644
--- a/sf_manufacturing/models/mrp_workcenter.py
+++ b/sf_manufacturing/models/mrp_workcenter.py
@@ -5,7 +5,7 @@ from odoo.addons.resource.models.resource import Intervals
 
 class ResWorkcenter(models.Model):
     _inherit = "mrp.workcenter"
-    machine_tool_id = fields.Many2one('mrs.machine_tool', '机床')
+    machine_tool_id = fields.Many2one('sf.machine_tool', '机床')
 
     equipment_ids = fields.One2many(
         'maintenance.equipment', 'workcenter_id', string="Maintenance Equipment",
@@ -13,7 +13,7 @@ class ResWorkcenter(models.Model):
 
     def action_work_order(self):
         if not self.env.context.get('desktop_list_view', False):
-            action = self.env["ir.actions.actions"]._for_xml_id("sf_route_workcenter.mrp_workorder_action_tablet")
+            action = self.env["ir.actions.actions"]._for_xml_id("sf_manufacturing.mrp_workorder_action_tablet")
             return action
         else:
             return super(MrpWorkcenter, self).action_work_order()
diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index 28fe31db..e86d52da 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -199,9 +199,9 @@ class ResMrpWorkOrder(models.Model):
     def fetchCNC(self):
         res = [{'model_code': self.product_id.barcode, 'production_no': self.production_id.name,
                 'machine_tool_code': self.workcenter_id.machine_tool_id.code,
-                'material_code': self.env['mrs.production.materials'].search(
+                'material_code': self.env['sf.production.materials'].search(
                     [('id', '=', self.product_id.materials_id.id)]).materials_no,
-                'material_type_code': self.env['mrs.materials.model'].search(
+                'material_type_code': self.env['sf.materials.model'].search(
                     [('id', '=', self.product_id.materials_type_id.id)]).materials_no,
                 'embryo_long': self.product_id.bom_ids.bom_line_ids.product_id.long,
                 'embryo_height': self.product_id.bom_ids.bom_line_ids.product_id.height,
@@ -209,9 +209,9 @@ class ResMrpWorkOrder(models.Model):
                 # 'factory_code': self.env.user.company_id.partner_id.
                 }]
         configsettings = self.env['res.config.settings'].get_values()
-        config_header = Common.get_headers(self, configsettings['token'], configsettings['mrs_secret_key'])
+        config_header = Common.get_headers(self, configsettings['token'], configsettings['sf_secret_key'])
         url = '/api/intelligent_programming/create'
-        config_url = configsettings['mrs_url'] + url
+        config_url = configsettings['sf_url'] + url
         res_str = json.dumps(res)
         ret = requests.post(config_url, json={"result": res_str}, data=None, headers=config_header)
         ret = ret.json()
diff --git a/sf_mrs_connect/controllers/controllers.py b/sf_mrs_connect/controllers/controllers.py
index 5d6e8160..55bcef40 100644
--- a/sf_mrs_connect/controllers/controllers.py
+++ b/sf_mrs_connect/controllers/controllers.py
@@ -22,6 +22,6 @@ class Sf_Mrs_Connect(http.Controller):
             ret = json.loads(datas)
             ret = json.loads(ret['result'])
             for obj in ret:
-                request.env['cnc.processing'].with_user(request.env.ref("base.user_admin")).CNCprocessing_create(obj)
+                request.env['sf.cnc.processing'].with_user(request.env.ref("base.user_admin")).CNCprocessing_create(obj)
         except Exception as e:
             logging.info('get_cnc_processing_create error:%s' % e)