From aa7e39c28a83b31e75029606a55cdc41f4d6a6ce Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Fri, 4 Aug 2023 17:33:21 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=97=B6=E5=AE=9E=E6=97=B6=E6=B3=A8=E5=86=8C?=
 =?UTF-8?q?=E5=A4=B9=E5=85=B7=E4=BA=A7=E5=93=81=E5=88=B0cloud?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_base/models/fixture.py                   |  4 --
 sf_manufacturing/models/product_template.py | 46 +++++++++++++++++++++
 sf_manufacturing/models/stock.py            |  3 +-
 sf_mrs_connect/models/res_config_setting.py |  8 ++--
 4 files changed, 52 insertions(+), 9 deletions(-)

diff --git a/sf_base/models/fixture.py b/sf_base/models/fixture.py
index d929cad9..8e56fd08 100644
--- a/sf_base/models/fixture.py
+++ b/sf_base/models/fixture.py
@@ -1,8 +1,4 @@
 from odoo import models, fields, api
-from odoo.addons.sf_base.commons.common import Common
-from odoo.exceptions import ValidationError
-import requests
-import json
 
 
 class FixtureMaterial(models.Model):
diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py
index 85f8313f..6bd94673 100644
--- a/sf_manufacturing/models/product_template.py
+++ b/sf_manufacturing/models/product_template.py
@@ -1,4 +1,8 @@
 from odoo import models, fields, api
+from odoo.addons.sf_base.commons.common import Common
+from odoo.exceptions import ValidationError,UserError
+import requests
+import json
 
 
 class ResProductMo(models.Model):
@@ -152,6 +156,12 @@ class ResProductMo(models.Model):
     fixture_through_hole_size = fields.Integer(string="过孔大小[mm]", size=6)
     fixture_screw_size = fields.Integer(string="螺牙大小[mm]", size=6)
 
+    def _json_apply_machine_tool_type_item_code(self, item):
+        code_arr = []
+        for i in item.fixture_apply_machine_tool_type_ids:
+            code_arr.append(i.code)
+        return code_arr
+
     def _get_ids(self, param):
         type_ids = []
         if not param:
@@ -350,6 +360,42 @@ class ResProductMo(models.Model):
                 item.cutting_tool_standard_speed = False
                 item.image_1920 = False
 
+    # 将采购到的夹具注册到Cloud
+    def _register_fixture(self):
+        config = self.env['res.config.settings'].get_values()
+        headers = Common.get_headers(self, config['token'], config['sf_secret_key'])
+        strurl = config['sf_url'] + self.crea_url
+        for item in self:
+            val = {
+                'factory_token': config['token'],
+                'name': item.name,
+                'brand_id': item.brand_id.code,
+                'materials_type_id': item.materials_type_id.code,
+                'fixture_material_code': item.fixture_material_id.code,
+                'fixture_multi_mounting_type_id': item.fixture_multi_mounting_type_id.code,
+                'fixture_clamping_way': item.fixture_clamping_way,
+                'fixture_port_type': item.fixture_port_type,
+                'fixture_clamp_workpiece_length_max': item.fixture_clamp_workpiece_length_max,
+                'fixture_clamp_workpiece_width_max': item.fixture_clamp_workpiece_width_max,
+                'fixture_clamp_workpiece_height_max': item.fixture_clamp_workpiece_height_max.id,
+                'fixture_clamp_workpiece_diameter_max': item.fixture_clamp_workpiece_diameter_max,
+                'fixture_maximum_carrying_weight': item.fixture_maximum_carrying_weight,
+                'fixture_maximum_clamping_force': item.fixture_maximum_clamping_force,
+                'fixture_driving_way': item.fixture_driving_way,
+                'fixture_apply_machine_tool_type_ids': self._json_apply_machine_tool_type_item_code(item),
+                'fixture_through_hole_size': item.fixture_through_hole_size,
+                'fixture_screw_size': item.fixture_screw_size,
+            }
+        try:
+            ret = requests.post(strurl, json={}, data=val, headers=headers)
+            ret = ret.json()
+            if ret['status'] == 200:
+                raise UserError(ret['message'])
+            else:
+                raise UserError(ret['message'])
+        except Exception as e:
+            raise UserError("注册夹具到云端失败，请联系管理员！")
+
 
 class ResMrpBomMo(models.Model):
     _inherit = 'mrp.bom'
diff --git a/sf_manufacturing/models/stock.py b/sf_manufacturing/models/stock.py
index eab3a74c..71e23dc3 100644
--- a/sf_manufacturing/models/stock.py
+++ b/sf_manufacturing/models/stock.py
@@ -276,7 +276,8 @@ class StockPicking(models.Model):
                 if picking_out.state != 'done':
                     raise UserError(
                         _('该入库单对应的单号为%s的出库单还未完成，不能进行验证操作！' % picking_out.name))
-
+        # 采购单验证(夹具和刀具)
+        if self.product_id.categ_type in ['刀具', '夹具']:
         res = super().button_validate()
         return res
 
diff --git a/sf_mrs_connect/models/res_config_setting.py b/sf_mrs_connect/models/res_config_setting.py
index 4d9c0ece..12ba5b31 100644
--- a/sf_mrs_connect/models/res_config_setting.py
+++ b/sf_mrs_connect/models/res_config_setting.py
@@ -61,12 +61,12 @@ class ResConfigSettings(models.TransientModel):
             _logger.info("同步夹具物料")
             self.env['sf.multi_mounting.type'].sync_all_multi_mounting_type()
             _logger.info("同步联装类型")
-            self.env['sf.fixture.model'].sync_all_fixture_model()
-            _logger.info("同步夹具型号")
+            # self.env['sf.fixture.model'].sync_all_fixture_model()
+            # _logger.info("同步夹具型号")
             self.env['sf.functional.fixture.type'].sync_all_functional_fixture_type()
             _logger.info("同步功能夹具类型")
-            self.env['sf.functional.fixture'].sync_all_functional_fixture()
-            _logger.info("同步功能夹具")
+            # self.env['sf.functional.fixture'].sync_all_functional_fixture()
+            # _logger.info("同步功能夹具")
         except Exception as e:
             _logger.info("捕获错误信息:%s" % e)
             raise ValidationError("数据错误导致同步失败,请联系管理员")

From b3f2065edd7ad8391347bbaa009cced966821ad7 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Mon, 7 Aug 2023 17:29:17 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E5=A4=B9=E5=85=B7=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E6=B3=A8=E5=86=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_base/views/fixture_view.xml              |   4 +-
 sf_dlm/views/product_template_view.xml      |   4 +-
 sf_manufacturing/models/product_template.py | 137 +++++++-------------
 sf_manufacturing/models/stock.py            |  51 ++++++++
 4 files changed, 105 insertions(+), 91 deletions(-)

diff --git a/sf_base/views/fixture_view.xml b/sf_base/views/fixture_view.xml
index 65cf2ce1..53714553 100644
--- a/sf_base/views/fixture_view.xml
+++ b/sf_base/views/fixture_view.xml
@@ -161,7 +161,7 @@
         <field name="name">夹具型号</field>
         <field name="model">sf.fixture.model</field>
         <field name="arch" type="xml">
-            <tree string="夹具型号" create="0" edit="0" delete="0">
+            <tree string="夹具型号">
                 <field name="code"/>
                 <field name="name"/>
                 <field name="brand_id"/>
@@ -175,7 +175,7 @@
         <field name="name">夹具型号</field>
         <field name="model">sf.fixture.model</field>
         <field name="arch" type="xml">
-            <form string="夹具型号" create="0" edit="0" delete="0">
+            <form string="夹具型号">
                 <sheet>
                     <group>
                         <group>
diff --git a/sf_dlm/views/product_template_view.xml b/sf_dlm/views/product_template_view.xml
index 3fcdcf1b..2fc78eda 100644
--- a/sf_dlm/views/product_template_view.xml
+++ b/sf_dlm/views/product_template_view.xml
@@ -227,7 +227,7 @@
                         <group string="参数"
                                attrs='{"invisible": ["|",("fixture_model_id", "=", False),("fixture_material_type","not in",("气动托盘","转接板(锁板)托盘","磁吸托盘","虎钳托盘","零点卡盘"))]}'>
                             <group>
-                                <label for="tool_length" string="尺寸[mm]"/>
+                                <label for="tool_length" string="尺寸(mm)"/>
                                 <div class="o_address_format">
                                     <label for="tool_length" string="长"/>
                                     <field name="tool_length" class="o_address_zip"
@@ -242,7 +242,7 @@
                                            options="{'format': false}"/>
                                 </div>
                                 <field name="tool_weight"></field>
-                                <label for="fixture_clamp_workpiece_length_max" string="夹持工件最大尺寸[mm]"
+                                <label for="fixture_clamp_workpiece_length_max" string="夹持工件最大尺寸(mm)"
                                        attrs='{"invisible": [("fixture_material_type","=",("零点卡盘"))]}'/>
                                 <div class="o_address_format"
                                      attrs='{"invisible": [("fixture_material_type","=",("零点卡盘"))]}'>
diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py
index 6bd94673..b913ef78 100644
--- a/sf_manufacturing/models/product_template.py
+++ b/sf_manufacturing/models/product_template.py
@@ -1,8 +1,4 @@
 from odoo import models, fields, api
-from odoo.addons.sf_base.commons.common import Common
-from odoo.exceptions import ValidationError,UserError
-import requests
-import json
 
 
 class ResProductMo(models.Model):
@@ -14,10 +10,10 @@ class ResProductMo(models.Model):
         string='产品的类别', related='categ_id.type',
         store=True)
     model_name = fields.Char('模型名称')
-    model_long = fields.Float('模型长[mm]', digits=(16, 3))
-    model_width = fields.Float('模型宽[mm]', digits=(16, 3))
-    model_height = fields.Float('模型高[mm]', digits=(16, 3))
-    model_volume = fields.Float('模型体积[m³]')
+    model_long = fields.Float('模型长(mm)', digits=(16, 3))
+    model_width = fields.Float('模型宽(mm)', digits=(16, 3))
+    model_height = fields.Float('模型高(mm)', digits=(16, 3))
+    model_volume = fields.Float('模型体积(m³)')
     model_machining_precision = fields.Selection([
         ('0.10', '±0.10mm'),
         ('0.05', '±0.05mm'),
@@ -26,9 +22,9 @@ class ResProductMo(models.Model):
         ('0.01', '±0.01mm')], string='加工精度')
     model_processing_panel = fields.Char('模型加工面板')
     model_remark = fields.Char('模型备注说明')
-    length = fields.Float('长[mm]', digits=(16, 3))
-    width = fields.Float('宽[mm]', digits=(16, 3))
-    height = fields.Float('高[mm]', digits=(16, 3))
+    length = fields.Float('长(mm)', digits=(16, 3))
+    width = fields.Float('宽(mm)', digits=(16, 3))
+    height = fields.Float('高(mm)', digits=(16, 3))
     single_manufacturing = fields.Boolean(string="单个制造")
 
     model_code = fields.Char('模型编码')
@@ -50,21 +46,22 @@ class ResProductMo(models.Model):
                                             )
 
     brand_id = fields.Many2one('sf.machine.brand', '品牌')
-    tool_length = fields.Integer('长度L[mm]', size=6)
-    tool_width = fields.Integer('宽度D[mm])', size=6)
-    tool_height = fields.Integer('高度T[mm]', size=6)
-    tool_weight = fields.Float('重量[kg]', size=4)
+    manufacturer_model_number = fields.Char('厂家型号')
+    tool_length = fields.Integer('长度L(mm)', size=6)
+    tool_width = fields.Integer('宽度D(mm)', size=6)
+    tool_height = fields.Integer('高度T(mm)', size=6)
+    tool_weight = fields.Float('重量(kg)', size=4)
     # 整体式刀具参数
-    cutting_tool_total_length = fields.Float('总长度[mm]')
-    cutting_tool_shank_length = fields.Float('柄部长度[mm]')
-    cutting_tool_blade_length = fields.Float('刃部长度[mm]')
-    cutting_tool_diameter = fields.Float('直径[mm]')
+    cutting_tool_total_length = fields.Float('总长度(mm)')
+    cutting_tool_shank_length = fields.Float('柄部长度(mm)')
+    cutting_tool_blade_length = fields.Float('刃部长度(mm)')
+    cutting_tool_diameter = fields.Float('直径(mm)')
     cutting_tool_blade_number = fields.Integer('刃数')
-    cutting_tool_front_angle = fields.Float('前角[°]')
-    cutting_tool_rear_angle = fields.Float('后角[°]')
-    cutting_tool_main_included_angle = fields.Float('主偏角[°]')
+    cutting_tool_front_angle = fields.Float('前角(°)')
+    cutting_tool_rear_angle = fields.Float('后角(°)')
+    cutting_tool_main_included_angle = fields.Float('主偏角(°)')
     cutting_tool_material_model_id = fields.Many2one('sf.materials.model', '材料型号')
-    cutting_tool_nut = fields.Float('配对螺母[mm]')
+    cutting_tool_nut = fields.Float('配对螺母(mm)')
     # 适用夹头型号可以多选
     cutting_tool_chuck_model_ids = fields.Many2many(
         'sf.cutting.tool.model',
@@ -76,8 +73,8 @@ class ResProductMo(models.Model):
     cutting_tool_scope = fields.Char('适用范围')
     # 刀片参数
 
-    cutting_tool_top_angle = fields.Float('顶角[°]')
-    cutting_tool_r_angle = fields.Float('R角[°]')
+    cutting_tool_top_angle = fields.Float('顶角(°)')
+    cutting_tool_r_angle = fields.Float('R角(°)')
     cutting_tool_working_hardness = fields.Char('加工硬度')
     cutting_tool_cutter_bar_ids = fields.Many2many(
         'sf.cutting.tool.model',
@@ -95,11 +92,11 @@ class ResProductMo(models.Model):
         domain="[('mrs_cutting_tool_material_id.name', '=', '刀盘')]",
         string='适用刀盘型号'  # 使用空列表作为默认值
     )
-    cutting_tool_radius = fields.Float('刀尖半径[mm]')
+    cutting_tool_radius = fields.Float('刀尖半径(mm)')
     # 刀杆/刀盘参数
-    cutting_tool_c_diameter = fields.Float('C柄径[mm]')
-    cutting_tool_l_total_length = fields.Float('L总长[mm]')
-    cutting_tool_d_diameter = fields.Float('D刃径[mm]')
+    cutting_tool_c_diameter = fields.Float('C柄径(mm)')
+    cutting_tool_l_total_length = fields.Float('L总长(mm)')
+    cutting_tool_d_diameter = fields.Float('D刃径(mm)')
     cutting_tool_blade_ids = fields.Many2many(
         'sf.cutting.tool.model',
         relation='product_cutting_tool_model_pad_blade_rel',
@@ -108,25 +105,25 @@ class ResProductMo(models.Model):
         domain="[('mrs_cutting_tool_material_id.name', '=', '刀片')]",
         string='适用刀片型号'  # 使用空列表作为默认值
     )
-    cutting_tool_wrench = fields.Float('配对扳手[mm]')
-    cutting_tool_screw = fields.Float('配备螺丝[mm]')
+    cutting_tool_wrench = fields.Float('配对扳手(mm)')
+    cutting_tool_screw = fields.Float('配备螺丝(mm)')
     cutting_tool_accuracy_level = fields.Char('精度等级')
-    cutting_tool_rounded_corner = fields.Float('刀尖圆角半径[mm]')
-    cutting_tool_hardness = fields.Char('硬度[°]')
+    cutting_tool_rounded_corner = fields.Float('刀尖圆角半径(mm)')
+    cutting_tool_hardness = fields.Char('硬度(°)')
     # 刀柄参数
-    cutting_tool_handle_length = fields.Float('L[mm]')
-    cutting_tool_length1 = fields.Float('L1[mm]')
-    cutting_tool_diameter1 = fields.Float('D1[mm]')
+    cutting_tool_handle_length = fields.Float('L(mm)')
+    cutting_tool_length1 = fields.Float('L1(mm)')
+    cutting_tool_diameter1 = fields.Float('D1(mm)')
 
-    cutting_tool_body_accuracy = fields.Float('本体精度[mm]')
-    cutting_tool_clamping_range = fields.Float('夹持范围[mm]')
+    cutting_tool_body_accuracy = fields.Float('本体精度(mm)')
+    cutting_tool_clamping_range = fields.Float('夹持范围(mm)')
     cutting_tool_detection_accuracy = fields.Float('检测精度')
     cutting_tool_detection_hardness = fields.Float('检测硬度')
     cutting_tool_standard_speed = fields.Float('标准转速')
     # 夹头参数
-    cutting_tool_accuracy = fields.Float('精度[mm]')
-    cutting_tool_outer_diameter = fields.Float('外径[mm]')
-    cutting_tool_inner_diameter = fields.Float('内径[mm]')
+    cutting_tool_accuracy = fields.Float('精度(mm)')
+    cutting_tool_outer_diameter = fields.Float('外径(mm)')
+    cutting_tool_inner_diameter = fields.Float('内径(mm)')
     cutting_tool_handle_model_ids = fields.Many2many(
         'sf.cutting.tool.model',
         relation='product_cutting_tool_model_chuck_handle_rel',
@@ -144,21 +141,23 @@ class ResProductMo(models.Model):
     fixture_clamping_way = fields.Char(string="装夹方式")
     fixture_port_type = fields.Char(string="接口类型")
     fixture_model_file = fields.Binary(string="3D模型图")
-    fixture_clamp_workpiece_length_max = fields.Integer(string="夹持工件长度MAX[mm]", size=6)
-    fixture_clamp_workpiece_width_max = fields.Integer(string="夹持工件宽度MAX[mm]", size=6)
-    fixture_clamp_workpiece_height_max = fields.Integer(string="夹持工件高度MAX[mm]", size=6)
-    fixture_clamp_workpiece_diameter_max = fields.Float(string="夹持工件直径MAX[mm]", digits=(16, 6))
-    fixture_maximum_carrying_weight = fields.Float(string="最大承载重量[kg]", digits=(16, 4))
-    fixture_maximum_clamping_force = fields.Integer(string="最大夹持力[n]", size=8)
+    fixture_clamp_workpiece_length_max = fields.Integer(string="夹持工件长度MAX(mm)", size=6)
+    fixture_clamp_workpiece_width_max = fields.Integer(string="夹持工件宽度MAX(mm)", size=6)
+    fixture_clamp_workpiece_height_max = fields.Integer(string="夹持工件高度MAX(mm)", size=6)
+    fixture_clamp_workpiece_diameter_max = fields.Float(string="夹持工件直径MAX(mm)", digits=(16, 6))
+    fixture_maximum_carrying_weight = fields.Float(string="最大承载重量(kg)", digits=(16, 4))
+    fixture_maximum_clamping_force = fields.Integer(string="最大夹持力(n)", size=8)
     fixture_driving_way = fields.Char(string="驱动方式")
     fixture_apply_machine_tool_type_ids = fields.Many2many('sf.machine_tool.type', 'rel_product_machine_tool_type',
                                                            string="适用机床型号")
-    fixture_through_hole_size = fields.Integer(string="过孔大小[mm]", size=6)
-    fixture_screw_size = fields.Integer(string="螺牙大小[mm]", size=6)
+    fixture_through_hole_size = fields.Integer(string="过孔大小(mm)", size=6)
+    fixture_screw_size = fields.Integer(string="螺牙大小(mm)", size=6)
+    # 注册状态
+    register_state = fields.Selection([('未注册', '未注册'), ('已注册', '已注册'),('注册失败','注册失败')], string='注册状态', default='未注册')
 
     def _json_apply_machine_tool_type_item_code(self, item):
         code_arr = []
-        for i in item.fixture_apply_machine_tool_type_ids:
+        for i in item.product_id.fixture_apply_machine_tool_type_ids:
             code_arr.append(i.code)
         return code_arr
 
@@ -216,7 +215,7 @@ class ResProductMo(models.Model):
                     item.fixture_clamp_workpiece_width_max = item.fixture_model_id.clamp_workpiece_width_max
                     item.fixture_clamp_workpiece_height_max = item.fixture_model_id.clamp_workpiece_height_max
                     item.fixture_clamp_workpiece_diameter_max = item.fixture_model_id.clamp_workpiece_diameter_max
-                    item.fixture_apply_machine_tool_type_id = self._get_ids(item.fixture_model_id.apply_machine_tool_type_ids)
+                    item.fixture_apply_machine_tool_type_ids = self._get_ids(item.fixture_model_id.apply_machine_tool_type_ids)
 
     @api.onchange('cutting_tool_model_id')
     def _onchange_cutting_tool_model_id(self):
@@ -360,42 +359,6 @@ class ResProductMo(models.Model):
                 item.cutting_tool_standard_speed = False
                 item.image_1920 = False
 
-    # 将采购到的夹具注册到Cloud
-    def _register_fixture(self):
-        config = self.env['res.config.settings'].get_values()
-        headers = Common.get_headers(self, config['token'], config['sf_secret_key'])
-        strurl = config['sf_url'] + self.crea_url
-        for item in self:
-            val = {
-                'factory_token': config['token'],
-                'name': item.name,
-                'brand_id': item.brand_id.code,
-                'materials_type_id': item.materials_type_id.code,
-                'fixture_material_code': item.fixture_material_id.code,
-                'fixture_multi_mounting_type_id': item.fixture_multi_mounting_type_id.code,
-                'fixture_clamping_way': item.fixture_clamping_way,
-                'fixture_port_type': item.fixture_port_type,
-                'fixture_clamp_workpiece_length_max': item.fixture_clamp_workpiece_length_max,
-                'fixture_clamp_workpiece_width_max': item.fixture_clamp_workpiece_width_max,
-                'fixture_clamp_workpiece_height_max': item.fixture_clamp_workpiece_height_max.id,
-                'fixture_clamp_workpiece_diameter_max': item.fixture_clamp_workpiece_diameter_max,
-                'fixture_maximum_carrying_weight': item.fixture_maximum_carrying_weight,
-                'fixture_maximum_clamping_force': item.fixture_maximum_clamping_force,
-                'fixture_driving_way': item.fixture_driving_way,
-                'fixture_apply_machine_tool_type_ids': self._json_apply_machine_tool_type_item_code(item),
-                'fixture_through_hole_size': item.fixture_through_hole_size,
-                'fixture_screw_size': item.fixture_screw_size,
-            }
-        try:
-            ret = requests.post(strurl, json={}, data=val, headers=headers)
-            ret = ret.json()
-            if ret['status'] == 200:
-                raise UserError(ret['message'])
-            else:
-                raise UserError(ret['message'])
-        except Exception as e:
-            raise UserError("注册夹具到云端失败，请联系管理员！")
-
 
 class ResMrpBomMo(models.Model):
     _inherit = 'mrp.bom'
diff --git a/sf_manufacturing/models/stock.py b/sf_manufacturing/models/stock.py
index 71e23dc3..bcf352c1 100644
--- a/sf_manufacturing/models/stock.py
+++ b/sf_manufacturing/models/stock.py
@@ -1,6 +1,10 @@
 # -*- coding: utf-8 -*-
 from collections import defaultdict, namedtuple
 from odoo.addons.stock.models.stock_rule import ProcurementException
+from odoo.addons.sf_base.commons.common import Common
+from odoo.exceptions import ValidationError, UserError
+import requests
+import json
 from re import findall as regex_findall
 from datetime import datetime
 from re import split as regex_split
@@ -278,9 +282,56 @@ class StockPicking(models.Model):
                         _('该入库单对应的单号为%s的出库单还未完成，不能进行验证操作！' % picking_out.name))
         # 采购单验证(夹具和刀具)
         if self.product_id.categ_type in ['刀具', '夹具']:
+            self._register_fixture()
         res = super().button_validate()
         return res
 
+    # 将采购到的夹具注册到Cloud
+    def _register_fixture(self):
+        create_url = '/api/fixture/create'
+        config = self.env['res.config.settings'].get_values()
+        headers = Common.get_headers(self, config['token'], config['sf_secret_key'])
+        strurl = config['sf_url'] + create_url
+        for item in self:
+            val = {
+                'token': config['token'],
+                'name': item.name,
+                'brand_code': self.env['sf.machine.brand'].search([('id', '=', item.product_id.brand_id.id)]).code,
+                'manufacturer_model_number': item.product_id.manufacturer_model_number,
+                'fixture_material_code': self.env['sf.fixture.material'].search(
+                    [('id', '=', item.product_id.fixture_material_id.id)]).code,
+                'fixture_multi_mounting_type_code': self.env['sf.multi_mounting.type'].search(
+                    [('id', '=', item.product_id.fixture_multi_mounting_type_id.id)]).code,
+                'fixture_materials_type_code': self.env['sf.materials.model'].search(
+                    [('id', '=', item.product_id.materials_type_id.id)]).materials_no,
+                'fixture_clamping_way': item.product_id.fixture_clamping_way,
+                'fixture_port_type': item.product_id.fixture_port_type,
+                'fixture_length': item.product_id.tool_length,
+                'fixture_width': item.product_id.tool_width,
+                'fixture_height': item.product_id.tool_height,
+                'fixture_weight': item.product_id.tool_weight,
+                'fixture_clamp_workpiece_length_max': item.product_id.fixture_clamp_workpiece_length_max,
+                'fixture_clamp_workpiece_width_max': item.product_id.fixture_clamp_workpiece_width_max,
+                'fixture_clamp_workpiece_height_max': item.product_id.fixture_clamp_workpiece_height_max,
+                'fixture_clamp_workpiece_diameter_max': item.product_id.fixture_clamp_workpiece_diameter_max,
+                'fixture_maximum_carrying_weight': item.product_id.fixture_maximum_carrying_weight,
+                'fixture_maximum_clamping_force': item.product_id.fixture_maximum_clamping_force,
+                'fixture_driving_way': item.product_id.fixture_driving_way,
+                'fixture_apply_machine_tool_type_codes': self.env[
+                    'product.template']._json_apply_machine_tool_type_item_code(item),
+                'fixture_through_hole_size': item.product_id.fixture_through_hole_size,
+                'fixture_screw_size': item.product_id.fixture_screw_size,
+            }
+        try:
+            ret = requests.post(strurl, json={}, data=val, headers=headers)
+            ret = ret.json()
+            if ret['status'] == 200:
+                item.product_id.write({'register_state': '已注册'})
+            else:
+                item.product_id.write({'register_state': '注册失败'})
+        except Exception as e:
+            raise UserError("注册夹具到云端失败，请联系管理员！")
+
     # 创建 外协出库入单
     def create_outcontract_picking(self, sorted_workorders_arr, item):
         m = 0

From 9fe58a1fba169734261745f5ecd83bedb2356b08 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Tue, 8 Aug 2023 18:17:49 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E5=88=80=E5=85=B7=E5=9E=8B=E5=8F=B7?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_base/models/tool_base_new.py |  37 +--
 sf_base/views/tool_views.xml    | 416 ++++++++++++++++----------------
 2 files changed, 233 insertions(+), 220 deletions(-)

diff --git a/sf_base/models/tool_base_new.py b/sf_base/models/tool_base_new.py
index 048c94d3..7431d9c0 100644
--- a/sf_base/models/tool_base_new.py
+++ b/sf_base/models/tool_base_new.py
@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 from odoo import fields, models, api
+
+
 # from datetime import datetime
 # from odoo.exceptions import ValidationError
 
@@ -26,32 +28,33 @@ class FunctionalCuttingTool(models.Model):
 
     # 整体式刀具型号
     mrs_cutting_tool_integral_model_ids = fields.Many2many('sf.cutting.tool.model', 'rel_integral_model_functional_sf',
-                                                            string='整体式刀具型号', domain=
-                                                            [('mrs_cutting_tool_material_name', '=', '整体式刀具')])
+                                                           string='整体式刀具型号', domain=
+                                                           [('mrs_cutting_tool_material_name', '=', '整体式刀具')])
     # 刀片型号
     mrs_cutting_tool_blade_model_ids = fields.Many2many('sf.cutting.tool.model', 'rel_blade_model_functional_sf',
-                                                         string='刀片型号', domain=
-                                                         [('mrs_cutting_tool_material_name', '=', '刀片')])
+                                                        string='刀片型号', domain=
+                                                        [('mrs_cutting_tool_material_name', '=', '刀片')])
     # 刀杆型号
     mrs_cutting_tool_cutterbar_model_ids = fields.Many2many('sf.cutting.tool.model',
-                                                             'rel_cutterbar_model_functional_sf',
-                                                             string='刀杆型号', domain=
-                                                             [('mrs_cutting_tool_material_name', '=', '刀杆')])
+                                                            'rel_cutterbar_model_functional_sf',
+                                                            string='刀杆型号', domain=
+                                                            [('mrs_cutting_tool_material_name', '=', '刀杆')])
     # 刀盘型号
     mrs_cutting_tool_cutterpad_model_ids = fields.Many2many('sf.cutting.tool.model',
-                                                             'rel_cutterpad_model_functional_sf',
-                                                             string='刀盘型号', domain=
-                                                             [('mrs_cutting_tool_material_name', '=', '刀盘')])
+                                                            'rel_cutterpad_model_functional_sf',
+                                                            string='刀盘型号', domain=
+                                                            [('mrs_cutting_tool_material_name', '=', '刀盘')])
     # 刀柄型号
     mrs_cutting_tool_cutterhandle_model_ids = fields.Many2many('sf.cutting.tool.model',
-                                                                'rel_cutterhandle_model_functional_sf', string='刀柄型号',
-                                                                domain=
-                                                                [('mrs_cutting_tool_material_name', '=', '刀柄')])
+                                                               'rel_cutterhandle_model_functional_sf',
+                                                               string='刀柄型号',
+                                                               domain=
+                                                               [('mrs_cutting_tool_material_name', '=', '刀柄')])
     # 夹头型号
     mrs_cutting_tool_cutterhead_model_ids = fields.Many2many('sf.cutting.tool.model',
-                                                              'rel_cutterhead_model_functional_sf',
-                                                              string='夹头型号', domain=
-                                                              [('mrs_cutting_tool_material_name', '=', '夹头')])
+                                                             'rel_cutterhead_model_functional_sf',
+                                                             string='夹头型号', domain=
+                                                             [('mrs_cutting_tool_material_name', '=', '夹头')])
 
     diameter = fields.Float('直径(mm)')
     tool_grade = fields.Selection([('1', 'P1'), ('2', 'P2'), ('3', 'P3'), ('4', 'P4'), ('5', 'P5'), ('6', 'P6')],
@@ -95,6 +98,8 @@ class CuttingToolModel(models.Model):
     mrs_materials_model_id = fields.Many2one('sf.materials.model', '材料型号')
     # 关联刀具物料
     mrs_cutting_tool_material_id = fields.Many2one('sf.cutting.tool.material', '刀具物料', required=True)
+    cutting_tool_material_type = fields.Char(related='mrs_cutting_tool_material_id.name', string='刀具物料类型',
+                                             store=True)
     # 关联刀具物料名称
     mrs_cutting_tool_material_name = fields.Char(related='mrs_cutting_tool_material_id.name', string='刀具物料名称',
                                                  store=True)
diff --git a/sf_base/views/tool_views.xml b/sf_base/views/tool_views.xml
index ccb98a7d..4e226eb7 100644
--- a/sf_base/views/tool_views.xml
+++ b/sf_base/views/tool_views.xml
@@ -211,213 +211,221 @@
             <field name="arch" type="xml">
                 <form string="刀具型号">
                     <sheet>
-                        <group col='1'>
-                            <group string='基本信息'>
-                                <group>
-                                    <field name="code"/>
-                                    <field name="name"/>
-                                    <field name="mrs_cutting_tool_material_id"
-                                           options="{'no_create': True, 'no_quick_create': True}"/>
-                                    <field name="mrs_machine_brand_id"
-                                           options="{'no_create': True, 'no_quick_create': True}"/>
-                                    <field name="mrs_materials_model_id"
-                                           options="{'no_create': True, 'no_quick_create': True}"/>
-                                    <field name="mrs_cutting_tool_type_id"
-                                           options="{'no_create': True, 'no_quick_create': True}"/>
-                                </group>
-                                <group>
-                                    <field name="image" nolabel="1" widget="image"/>
-                                </group>
+                        <group>
+                            <group>
+                                <field name="code"/>
+                                <field name="name"/>
+                                <field name="cutting_tool_material_type" invisible="1"/>
+                                <field name="mrs_cutting_tool_material_id"
+                                       options="{'no_create': True, 'no_quick_create': True}"/>
+                                <field name="mrs_machine_brand_id"
+                                       options="{'no_create': True, 'no_quick_create': True}"/>
+                                <field name="mrs_materials_model_id"
+                                       options="{'no_create': True, 'no_quick_create': True}"/>
+                                <field name="mrs_cutting_tool_type_id"
+                                       options="{'no_create': True, 'no_quick_create': True}"/>
                             </group>
-                            <group string='参数信息'>
-                                <group>
-                                    <field name="hide_integral" invisible="1"/>
-                                    <field name="hide_blade" invisible="1"/>
-                                    <field name="hide_cutter_bar" invisible="1"/>
-                                    <field name="hide_cutter_pad" invisible="1"/>
-                                    <field name="hide_handler" invisible="1"/>
-                                    <field name="hide_chuck" invisible="1"/>
-                                    <field name="mrs_cutting_tool_material_name" invisible="1"/>
-
-                                    <field name="integral_total_length"
-                                           attrs="{'invisible': [('hide_integral', '=', False)], 'required': [('hide_integral', '!=', False)]}"/>
-                                    <field name="integral_shank_length"
-                                           attrs="{'invisible': [('hide_integral', '=', False)], 'required': [('hide_integral', '!=', False)]}"/>
-                                    <field name="integral_blade_length"
-                                           attrs="{'invisible': [('hide_integral', '=', False)], 'required': [('hide_integral', '!=', False)]}"/>
-                                    <field name="integral_diameter"
-                                           attrs="{'invisible': [('hide_integral', '=', False)], 'required': [('hide_integral', '!=', False)]}"/>
-                                    <field name="integral_blade_number"
-                                           attrs="{'invisible': [('hide_integral', '=', False)], 'required': [('hide_integral', '!=', False)]}"/>
-                                    <field name="integral_accuracy"
-                                           attrs="{'invisible': [('hide_integral', '=', False)], 'required': [('hide_integral', '!=', False)]}"/>
-                                    <field name="integral_hardness"
-                                           attrs="{'invisible': [('hide_integral', '=', False)], 'required': [('hide_integral', '!=', False)]}"/>
-
-                                    <field name="blade_length"
-                                           attrs="{'invisible': [('hide_blade', '=', False)], 'required': [('hide_blade', '!=', False)]}"/>
-                                    <field name="blade_width"
-                                           attrs="{'invisible': [('hide_blade', '=', False)], 'required': [('hide_blade', '!=', False)]}"/>
-                                    <field name="blade_height"
-                                           attrs="{'invisible': [('hide_blade', '=', False)], 'required': [('hide_blade', '!=', False)]}"/>
-                                    <field name="blade_top_angle"
-                                           attrs="{'invisible': [('hide_blade', '=', False)], 'required': [('hide_blade', '!=', False)]}"/>
-                                    <field name="blade_front_angle"
-                                           attrs="{'invisible': [('hide_blade', '=', False)], 'required': [('hide_blade', '!=', False)]}"/>
-                                    <field name="blade_rear_angle"
-                                           attrs="{'invisible': [('hide_blade', '=', False)], 'required': [('hide_blade', '!=', False)]}"/>
-
-                                    <field name="bar_c_diameter"
-                                           attrs="{'invisible': [('hide_cutter_bar', '=', False)], 'required': [('hide_cutter_bar', '!=', False)]}"/>
-                                    <field name="bar_total_length"
-                                           attrs="{'invisible': [('hide_cutter_bar', '=', False)], 'required': [('hide_cutter_bar', '!=', False)]}"/>
-                                    <field name="bar_blade_number"
-                                           attrs="{'invisible': [('hide_cutter_bar', '=', False)], 'required': [('hide_cutter_bar', '!=', False)]}"/>
-                                    <field name="bar_d_diameter"
-                                           attrs="{'invisible': [('hide_cutter_bar', '=', False)], 'required': [('hide_cutter_bar', '!=', False)]}"/>
-                                    <field name="bar_wrench"
-                                           attrs="{'invisible': [('hide_cutter_bar', '=', False)], 'required': [('hide_cutter_bar', '!=', False)]}"/>
-
-
-                                    <field name="pad_c_diameter"
-                                           attrs="{'invisible': [('hide_cutter_pad', '=', False)], 'required': [('hide_cutter_pad', '!=', False)]}"/>
-                                    <field name="pad_total_length"
-                                           attrs="{'invisible': [('hide_cutter_pad', '=', False)], 'required': [('hide_cutter_pad', '!=', False)]}"/>
-                                    <field name="pad_blade_number"
-                                           attrs="{'invisible': [('hide_cutter_pad', '=', False)], 'required': [('hide_cutter_pad', '!=', False)]}"/>
-                                    <field name="pad_d_diameter"
-                                           attrs="{'invisible': [('hide_cutter_pad', '=', False)], 'required': [('hide_cutter_pad', '!=', False)]}"/>
-                                    <field name="pad_wrench"
-                                           attrs="{'invisible': [('hide_cutter_pad', '=', False)], 'required': [('hide_cutter_pad', '!=', False)]}"/>
-
-
-                                    <field name="handle_length"
-                                           attrs="{'invisible': [('hide_handler', '=', False)], 'required': [('hide_handler', '!=', False)]}"/>
-                                    <field name="handle_flange_length"
-                                           attrs="{'invisible': [('hide_handler', '=', False)], 'required': [('hide_handler', '!=', False)]}"/>
-                                    <field name="handle_flange_diameter"
-                                           attrs="{'invisible': [('hide_handler', '=', False)], 'required': [('hide_handler', '!=', False)]}"/>
-                                    <field name="handle_weight"
-                                           attrs="{'invisible': [('hide_handler', '=', False)], 'required': [('hide_handler', '!=', False)]}"/>
-                                    <field name="handle_body_accuracy"
-                                           attrs="{'invisible': [('hide_handler', '=', False)], 'required': [('hide_handler', '!=', False)]}"/>
-                                    <field name="handle_clamping_diameter_min"
-                                           attrs="{'invisible': [('hide_handler', '=', False)], 'required': [('hide_handler', '!=', False)]}"/>
-                                    <field name="handle_clamping_diameter_max"
-                                           attrs="{'invisible': [('hide_handler', '=', False)], 'required': [('hide_handler', '!=', False)]}"/>
-
-
-                                    <field name="chuck_accuracy"
-                                           attrs="{'invisible': [('hide_chuck', '=', False)], 'required': [('hide_chuck', '!=', False)]}"/>
-                                    <field name="chuck_diameter"
-                                           attrs="{'invisible': [('hide_chuck', '=', False)], 'required': [('hide_chuck', '!=', False)]}"/>
-                                    <field name="chuck_inner_diameter"
-                                           attrs="{'invisible': [('hide_chuck', '=', False)], 'required': [('hide_chuck', '!=', False)]}"/>
-                                    <field name="chuck_height"
-                                           attrs="{'invisible': [('hide_chuck', '=', False)], 'required': [('hide_chuck', '!=', False)]}"/>
-
-
-                                </group>
-                                <group>
-
-                                    <field name="integral_front_angle"
-                                           attrs="{'invisible': [('hide_integral', '=', False)], 'required': [('hide_integral', '!=', False)]}"/>
-                                    <field name="integral_rear_angle"
-                                           attrs="{'invisible': [('hide_integral', '=', False)], 'required': [('hide_integral', '!=', False)]}"/>
-                                    <field name="integral_main_included_angle"
-                                           attrs="{'invisible': [('hide_integral', '=', False)], 'required': [('hide_integral', '!=', False)]}"/>
-                                    <field name="integral_coating_material"
-                                           attrs="{'invisible': [('hide_integral', '=', False)], 'required': [('hide_integral', '!=', False)]}"/>
-                                    <field name="integral_nut"
-                                           attrs="{'invisible': [('hide_integral', '=', False)], 'required': [('hide_integral', '!=', False)]}"/>
-                                    <field name="integral_scope"
-                                           attrs="{'invisible': [('hide_integral', '=', False)], 'required': [('hide_integral', '!=', False)]}"/>
-
-
-                                    <field name="blade_main_included_angle"
-                                           attrs="{'invisible': [('hide_blade', '=', False)], 'required': [('hide_blade', '!=', False)]}"/>
-                                    <field name="blade_r_angle"
-                                           attrs="{'invisible': [('hide_blade', '=', False)], 'required': [('hide_blade', '!=', False)]}"/>
-                                    <field name="blade_coating_material"
-                                           attrs="{'invisible': [('hide_blade', '=', False)], 'required': [('hide_blade', '!=', False)]}"/>
-                                    <field name="blade_hardness"
-                                           attrs="{'invisible': [('hide_blade', '=', False)], 'required': [('hide_blade', '!=', False)]}"/>
-                                    <field name="blade_radius"
-                                           attrs="{'invisible': [('hide_blade', '=', False)], 'required': [('hide_blade', '!=', False)]}"/>
-                                    <field name="blade_nut"
-                                           attrs="{'invisible': [('hide_blade', '=', False)], 'required': [('hide_blade', '!=', False)]}"/>
-
-
-                                    <field name="bar_screw"
-                                           attrs="{'invisible': [('hide_cutter_bar', '=', False)], 'required': [('hide_cutter_bar', '!=', False)]}"/>
-                                    <field name="bar_radius"
-                                           attrs="{'invisible': [('hide_cutter_bar', '=', False)], 'required': [('hide_cutter_bar', '!=', False)]}"/>
-                                    <field name="bar_hardness"
-                                           attrs="{'invisible': [('hide_cutter_bar', '=', False)], 'required': [('hide_cutter_bar', '!=', False)]}"/>
-                                    <field name="bar_scope"
-                                           attrs="{'invisible': [('hide_cutter_bar', '=', False)], 'required': [('hide_cutter_bar', '!=', False)]}"/>
-
-
-                                    <field name="pad_screw"
-                                           attrs="{'invisible': [('hide_cutter_pad', '=', False)], 'required': [('hide_cutter_pad', '!=', False)]}"/>
-                                    <field name="pad_radius"
-                                           attrs="{'invisible': [('hide_cutter_pad', '=', False)], 'required': [('hide_cutter_pad', '!=', False)]}"/>
-                                    <field name="pad_accuracy"
-                                           attrs="{'invisible': [('hide_cutter_pad', '=', False)], 'required': [('hide_cutter_pad', '!=', False)]}"/>
-                                    <field name="pad_hardness"
-                                           attrs="{'invisible': [('hide_cutter_pad', '=', False)], 'required': [('hide_cutter_pad', '!=', False)]}"/>
-                                    <field name="pad_scope"
-                                           attrs="{'invisible': [('hide_cutter_pad', '=', False)], 'required': [('hide_cutter_pad', '!=', False)]}"/>
-
-
-                                    <field name="handle_nut"
-                                           attrs="{'invisible': [('hide_handler', '=', False)], 'required': [('hide_handler', '!=', False)]}"/>
-                                    <field name="handle_clamping_range"
-                                           attrs="{'invisible': [('hide_handler', '=', False)], 'required': [('hide_handler', '!=', False)]}"/>
-                                    <field name="handle_detection_accuracy"
-                                           attrs="{'invisible': [('hide_handler', '=', False)], 'required': [('hide_handler', '!=', False)]}"/>
-                                    <field name="handle_detection_hardness"
-                                           attrs="{'invisible': [('hide_handler', '=', False)], 'required': [('hide_handler', '!=', False)]}"/>
-                                    <field name="handle_standard_speed"
-                                           attrs="{'invisible': [('hide_handler', '=', False)], 'required': [('hide_handler', '!=', False)]}"/>
-                                    <field name="handle_jump_accuracy"
-                                           attrs="{'invisible': [('hide_handler', '=', False)], 'required': [('hide_handler', '!=', False)]}"/>
-                                    <field name="handle_max_speed"
-                                           attrs="{'invisible': [('hide_handler', '=', False)], 'required': [('hide_handler', '!=', False)]}"/>
-
-                                    <field name="chuck_nut"
-                                           attrs="{'invisible': [('hide_chuck', '=', False)], 'required': [('hide_chuck', '!=', False)]}"/>
-                                    <field name="chuck_clamping_range"
-                                           attrs="{'invisible': [('hide_chuck', '=', False)], 'required': [('hide_chuck', '!=', False)]}"/>
-                                    <field name="chuck_feature"
-                                           attrs="{'invisible': [('hide_chuck', '=', False)], 'required': [('hide_chuck', '!=', False)]}"/>
-                                </group>
-                            </group>
-                            <group string='其他信息'>
-                                <group>
-                                    <field name="mrs_cutting_tool_model_blade_cutter_bar_ids" widget="many2many_tags"
-                                           options="{'no_create': True, 'no_quick_create': True}"
-                                           attrs="{'invisible': [('hide_blade', '=', False)]}"/>
-                                    <field name="mrs_cutting_tool_model_bar_blade_ids" widget="many2many_tags"
-                                           options="{'no_create': True, 'no_quick_create': True}"
-                                           attrs="{'invisible': [('hide_cutter_bar', '=', False)]}"/>
-                                    <field name="mrs_cutting_tool_model_pad_blade_ids" widget="many2many_tags"
-                                           options="{'no_create': True, 'no_quick_create': True}"
-                                           attrs="{'invisible': [('hide_cutter_pad', '=', False)]}"/>
-                                    <field name="mrs_cutting_tool_model_handle_chuck_model_ids" widget="many2many_tags"
-                                           options="{'no_create': True, 'no_quick_create': True}"
-                                           attrs="{'invisible': [('hide_handler', '=', False)]}"/>
-                                    <field name="mrs_cutting_tool_model_chuck_handle_model_ids" widget="many2many_tags"
-                                           options="{'no_create': True, 'no_quick_create': True}"
-                                           attrs="{'invisible': [('hide_chuck', '=', False)]}"/>
-                                </group>
-                                <group>
-                                    <field name="mrs_cutting_tool_model_blade_cutter_pad_ids" widget="many2many_tags"
-                                           options="{'no_create': True, 'no_quick_create': True}"
-                                           attrs="{'invisible': [('hide_blade', '=', False)]}"/>
-                                </group>
+                            <group>
+                                <field name="image" nolabel="1" widget="image"/>
                             </group>
                         </group>
+                        <notebook>
+                            <page string="参数"
+                                  attrs="{'invisible': [('cutting_tool_material_type', '=', False)]}">
+                                <group>
+                                    <group>
+                                        <field name="hide_integral" invisible="1"/>
+                                        <field name="hide_blade" invisible="1"/>
+                                        <field name="hide_cutter_bar" invisible="1"/>
+                                        <field name="hide_cutter_pad" invisible="1"/>
+                                        <field name="hide_handler" invisible="1"/>
+                                        <field name="hide_chuck" invisible="1"/>
+                                        <field name="mrs_cutting_tool_material_name" invisible="1"/>
+
+                                        <field name="integral_total_length"
+                                               attrs="{'invisible': [('hide_integral', '=', False)], 'required': [('hide_integral', '!=', False)]}"/>
+                                        <field name="integral_shank_length"
+                                               attrs="{'invisible': [('hide_integral', '=', False)], 'required': [('hide_integral', '!=', False)]}"/>
+                                        <field name="integral_blade_length"
+                                               attrs="{'invisible': [('hide_integral', '=', False)], 'required': [('hide_integral', '!=', False)]}"/>
+                                        <field name="integral_diameter"
+                                               attrs="{'invisible': [('hide_integral', '=', False)], 'required': [('hide_integral', '!=', False)]}"/>
+                                        <field name="integral_blade_number"
+                                               attrs="{'invisible': [('hide_integral', '=', False)], 'required': [('hide_integral', '!=', False)]}"/>
+                                        <field name="integral_accuracy"
+                                               attrs="{'invisible': [('hide_integral', '=', False)], 'required': [('hide_integral', '!=', False)]}"/>
+                                        <field name="integral_hardness"
+                                               attrs="{'invisible': [('hide_integral', '=', False)], 'required': [('hide_integral', '!=', False)]}"/>
+
+                                        <field name="blade_length"
+                                               attrs="{'invisible': [('hide_blade', '=', False)], 'required': [('hide_blade', '!=', False)]}"/>
+                                        <field name="blade_width"
+                                               attrs="{'invisible': [('hide_blade', '=', False)], 'required': [('hide_blade', '!=', False)]}"/>
+                                        <field name="blade_height"
+                                               attrs="{'invisible': [('hide_blade', '=', False)], 'required': [('hide_blade', '!=', False)]}"/>
+                                        <field name="blade_top_angle"
+                                               attrs="{'invisible': [('hide_blade', '=', False)], 'required': [('hide_blade', '!=', False)]}"/>
+                                        <field name="blade_front_angle"
+                                               attrs="{'invisible': [('hide_blade', '=', False)], 'required': [('hide_blade', '!=', False)]}"/>
+                                        <field name="blade_rear_angle"
+                                               attrs="{'invisible': [('hide_blade', '=', False)], 'required': [('hide_blade', '!=', False)]}"/>
+
+                                        <field name="bar_c_diameter"
+                                               attrs="{'invisible': [('hide_cutter_bar', '=', False)], 'required': [('hide_cutter_bar', '!=', False)]}"/>
+                                        <field name="bar_total_length"
+                                               attrs="{'invisible': [('hide_cutter_bar', '=', False)], 'required': [('hide_cutter_bar', '!=', False)]}"/>
+                                        <field name="bar_blade_number"
+                                               attrs="{'invisible': [('hide_cutter_bar', '=', False)], 'required': [('hide_cutter_bar', '!=', False)]}"/>
+                                        <field name="bar_d_diameter"
+                                               attrs="{'invisible': [('hide_cutter_bar', '=', False)], 'required': [('hide_cutter_bar', '!=', False)]}"/>
+                                        <field name="bar_wrench"
+                                               attrs="{'invisible': [('hide_cutter_bar', '=', False)], 'required': [('hide_cutter_bar', '!=', False)]}"/>
+
+
+                                        <field name="pad_c_diameter"
+                                               attrs="{'invisible': [('hide_cutter_pad', '=', False)], 'required': [('hide_cutter_pad', '!=', False)]}"/>
+                                        <field name="pad_total_length"
+                                               attrs="{'invisible': [('hide_cutter_pad', '=', False)], 'required': [('hide_cutter_pad', '!=', False)]}"/>
+                                        <field name="pad_blade_number"
+                                               attrs="{'invisible': [('hide_cutter_pad', '=', False)], 'required': [('hide_cutter_pad', '!=', False)]}"/>
+                                        <field name="pad_d_diameter"
+                                               attrs="{'invisible': [('hide_cutter_pad', '=', False)], 'required': [('hide_cutter_pad', '!=', False)]}"/>
+                                        <field name="pad_wrench"
+                                               attrs="{'invisible': [('hide_cutter_pad', '=', False)], 'required': [('hide_cutter_pad', '!=', False)]}"/>
+
+
+                                        <field name="handle_length"
+                                               attrs="{'invisible': [('hide_handler', '=', False)], 'required': [('hide_handler', '!=', False)]}"/>
+                                        <field name="handle_flange_length"
+                                               attrs="{'invisible': [('hide_handler', '=', False)], 'required': [('hide_handler', '!=', False)]}"/>
+                                        <field name="handle_flange_diameter"
+                                               attrs="{'invisible': [('hide_handler', '=', False)], 'required': [('hide_handler', '!=', False)]}"/>
+                                        <field name="handle_weight"
+                                               attrs="{'invisible': [('hide_handler', '=', False)], 'required': [('hide_handler', '!=', False)]}"/>
+                                        <field name="handle_body_accuracy"
+                                               attrs="{'invisible': [('hide_handler', '=', False)], 'required': [('hide_handler', '!=', False)]}"/>
+                                        <field name="handle_clamping_diameter_min"
+                                               attrs="{'invisible': [('hide_handler', '=', False)], 'required': [('hide_handler', '!=', False)]}"/>
+                                        <field name="handle_clamping_diameter_max"
+                                               attrs="{'invisible': [('hide_handler', '=', False)], 'required': [('hide_handler', '!=', False)]}"/>
+
+
+                                        <field name="chuck_accuracy"
+                                               attrs="{'invisible': [('hide_chuck', '=', False)], 'required': [('hide_chuck', '!=', False)]}"/>
+                                        <field name="chuck_diameter"
+                                               attrs="{'invisible': [('hide_chuck', '=', False)], 'required': [('hide_chuck', '!=', False)]}"/>
+                                        <field name="chuck_inner_diameter"
+                                               attrs="{'invisible': [('hide_chuck', '=', False)], 'required': [('hide_chuck', '!=', False)]}"/>
+                                        <field name="chuck_height"
+                                               attrs="{'invisible': [('hide_chuck', '=', False)], 'required': [('hide_chuck', '!=', False)]}"/>
+
+
+                                    </group>
+                                    <group>
+
+                                        <field name="integral_front_angle"
+                                               attrs="{'invisible': [('hide_integral', '=', False)], 'required': [('hide_integral', '!=', False)]}"/>
+                                        <field name="integral_rear_angle"
+                                               attrs="{'invisible': [('hide_integral', '=', False)], 'required': [('hide_integral', '!=', False)]}"/>
+                                        <field name="integral_main_included_angle"
+                                               attrs="{'invisible': [('hide_integral', '=', False)], 'required': [('hide_integral', '!=', False)]}"/>
+                                        <field name="integral_coating_material"
+                                               attrs="{'invisible': [('hide_integral', '=', False)], 'required': [('hide_integral', '!=', False)]}"/>
+                                        <field name="integral_nut"
+                                               attrs="{'invisible': [('hide_integral', '=', False)], 'required': [('hide_integral', '!=', False)]}"/>
+                                        <field name="integral_scope"
+                                               attrs="{'invisible': [('hide_integral', '=', False)], 'required': [('hide_integral', '!=', False)]}"/>
+
+
+                                        <field name="blade_main_included_angle"
+                                               attrs="{'invisible': [('hide_blade', '=', False)], 'required': [('hide_blade', '!=', False)]}"/>
+                                        <field name="blade_r_angle"
+                                               attrs="{'invisible': [('hide_blade', '=', False)], 'required': [('hide_blade', '!=', False)]}"/>
+                                        <field name="blade_coating_material"
+                                               attrs="{'invisible': [('hide_blade', '=', False)], 'required': [('hide_blade', '!=', False)]}"/>
+                                        <field name="blade_hardness"
+                                               attrs="{'invisible': [('hide_blade', '=', False)], 'required': [('hide_blade', '!=', False)]}"/>
+                                        <field name="blade_radius"
+                                               attrs="{'invisible': [('hide_blade', '=', False)], 'required': [('hide_blade', '!=', False)]}"/>
+                                        <field name="blade_nut"
+                                               attrs="{'invisible': [('hide_blade', '=', False)], 'required': [('hide_blade', '!=', False)]}"/>
+
+
+                                        <field name="bar_screw"
+                                               attrs="{'invisible': [('hide_cutter_bar', '=', False)], 'required': [('hide_cutter_bar', '!=', False)]}"/>
+                                        <field name="bar_radius"
+                                               attrs="{'invisible': [('hide_cutter_bar', '=', False)], 'required': [('hide_cutter_bar', '!=', False)]}"/>
+                                        <field name="bar_hardness"
+                                               attrs="{'invisible': [('hide_cutter_bar', '=', False)], 'required': [('hide_cutter_bar', '!=', False)]}"/>
+                                        <field name="bar_scope"
+                                               attrs="{'invisible': [('hide_cutter_bar', '=', False)], 'required': [('hide_cutter_bar', '!=', False)]}"/>
+
+
+                                        <field name="pad_screw"
+                                               attrs="{'invisible': [('hide_cutter_pad', '=', False)], 'required': [('hide_cutter_pad', '!=', False)]}"/>
+                                        <field name="pad_radius"
+                                               attrs="{'invisible': [('hide_cutter_pad', '=', False)], 'required': [('hide_cutter_pad', '!=', False)]}"/>
+                                        <field name="pad_accuracy"
+                                               attrs="{'invisible': [('hide_cutter_pad', '=', False)], 'required': [('hide_cutter_pad', '!=', False)]}"/>
+                                        <field name="pad_hardness"
+                                               attrs="{'invisible': [('hide_cutter_pad', '=', False)], 'required': [('hide_cutter_pad', '!=', False)]}"/>
+                                        <field name="pad_scope"
+                                               attrs="{'invisible': [('hide_cutter_pad', '=', False)], 'required': [('hide_cutter_pad', '!=', False)]}"/>
+
+
+                                        <field name="handle_nut"
+                                               attrs="{'invisible': [('hide_handler', '=', False)], 'required': [('hide_handler', '!=', False)]}"/>
+                                        <field name="handle_clamping_range"
+                                               attrs="{'invisible': [('hide_handler', '=', False)], 'required': [('hide_handler', '!=', False)]}"/>
+                                        <field name="handle_detection_accuracy"
+                                               attrs="{'invisible': [('hide_handler', '=', False)], 'required': [('hide_handler', '!=', False)]}"/>
+                                        <field name="handle_detection_hardness"
+                                               attrs="{'invisible': [('hide_handler', '=', False)], 'required': [('hide_handler', '!=', False)]}"/>
+                                        <field name="handle_standard_speed"
+                                               attrs="{'invisible': [('hide_handler', '=', False)], 'required': [('hide_handler', '!=', False)]}"/>
+                                        <field name="handle_jump_accuracy"
+                                               attrs="{'invisible': [('hide_handler', '=', False)], 'required': [('hide_handler', '!=', False)]}"/>
+                                        <field name="handle_max_speed"
+                                               attrs="{'invisible': [('hide_handler', '=', False)], 'required': [('hide_handler', '!=', False)]}"/>
+
+                                        <field name="chuck_nut"
+                                               attrs="{'invisible': [('hide_chuck', '=', False)], 'required': [('hide_chuck', '!=', False)]}"/>
+                                        <field name="chuck_clamping_range"
+                                               attrs="{'invisible': [('hide_chuck', '=', False)], 'required': [('hide_chuck', '!=', False)]}"/>
+                                        <field name="chuck_feature"
+                                               attrs="{'invisible': [('hide_chuck', '=', False)], 'required': [('hide_chuck', '!=', False)]}"/>
+                                    </group>
+                                    <group string='其他信息'>
+                                        <group>
+                                            <field name="mrs_cutting_tool_model_blade_cutter_bar_ids"
+                                                   widget="many2many_tags"
+                                                   options="{'no_create': True, 'no_quick_create': True}"
+                                                   attrs="{'invisible': [('hide_blade', '=', False)]}"/>
+                                            <field name="mrs_cutting_tool_model_bar_blade_ids" widget="many2many_tags"
+                                                   options="{'no_create': True, 'no_quick_create': True}"
+                                                   attrs="{'invisible': [('hide_cutter_bar', '=', False)]}"/>
+                                            <field name="mrs_cutting_tool_model_pad_blade_ids" widget="many2many_tags"
+                                                   options="{'no_create': True, 'no_quick_create': True}"
+                                                   attrs="{'invisible': [('hide_cutter_pad', '=', False)]}"/>
+                                            <field name="mrs_cutting_tool_model_handle_chuck_model_ids"
+                                                   widget="many2many_tags"
+                                                   options="{'no_create': True, 'no_quick_create': True}"
+                                                   attrs="{'invisible': [('hide_handler', '=', False)]}"/>
+                                            <field name="mrs_cutting_tool_model_chuck_handle_model_ids"
+                                                   widget="many2many_tags"
+                                                   options="{'no_create': True, 'no_quick_create': True}"
+                                                   attrs="{'invisible': [('hide_chuck', '=', False)]}"/>
+                                        </group>
+                                        <group>
+                                            <field name="mrs_cutting_tool_model_blade_cutter_pad_ids"
+                                                   widget="many2many_tags"
+                                                   options="{'no_create': True, 'no_quick_create': True}"
+                                                   attrs="{'invisible': [('hide_blade', '=', False)]}"/>
+                                        </group>
+                                    </group>
+                                </group>
+                            </page>
+                        </notebook>
                     </sheet>
                 </form>
             </field>

From 5644ee2670f6a3e58ecf3071b8d69752699499f9 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Fri, 18 Aug 2023 11:37:30 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E5=88=80=E5=85=B7=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_base/views/common_view.xml                | 78 --------------------
 sf_tool_management/views/tool_base_views.xml |  8 +-
 2 files changed, 4 insertions(+), 82 deletions(-)

diff --git a/sf_base/views/common_view.xml b/sf_base/views/common_view.xml
index a05155c7..e340650f 100644
--- a/sf_base/views/common_view.xml
+++ b/sf_base/views/common_view.xml
@@ -352,84 +352,7 @@
             <field name="view_mode">tree,form</field>
         </record>
 
-<!--        #&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;托盘&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;-->
-<!--        <record id="action_sf_tray" model="ir.actions.act_window">-->
-<!--            <field name="name">托盘</field>-->
-<!--            <field name="type">ir.actions.act_window</field>-->
-<!--            <field name="res_model">sf.tray</field>-->
-<!--            <field name="view_mode">tree,form</field>-->
-<!--            <field name="help" type="html">-->
-<!--                <p class="o_view_nocontent_smiling_face">-->
-<!--                    创建托盘吧-->
-<!--                </p>-->
-<!--            </field>-->
-<!--        </record>-->
 
-        <record id="view_sf_tray_search" model="ir.ui.view">
-            <field name="name">sf.tray.search</field>
-            <field name="model">sf.tray</field>
-            <field name="arch" type="xml">
-                <search string="托盘">
-                    <field name="name" string="名称" filter_domain="[('name','ilike',self)]"/>
-                    <field name="code" string="编码" filter_domain="[('code','ilike',self)]"/>
-                    <filter name="filter_active" string="已归档" domain="[('active','=',False)]"/>
-                    <group string="分组">
-                        <filter name="state" string="状态" domain="[]" context="{'group_by': 'state'}"/>
-                    </group>
-                </search>
-            </field>
-        </record>
-<!--        <record id="view_sf_tray_search" model="ir.ui.view">-->
-<!--            <field name="name">sf.tray.search</field>-->
-<!--            <field name="model">sf.tray</field>-->
-<!--            <field name="arch" type="xml">-->
-<!--                <search string="托盘">-->
-<!--                    <field name="name" string="名称" filter_domain="[('name','ilike',self)]"/>-->
-<!--                    <field name="code" string="编码" filter_domain="[('code','ilike',self)]"/>-->
-<!--                    <group string="分组">-->
-<!--                        <filter name="state" string="状态" domain="[]" context="{'group_by': 'state'}"/>-->
-<!--                    </group>-->
-<!--                </search>-->
-
-<!--            </field>-->
-<!--        </record>-->
-
-<!--        <record model="ir.ui.view" id="tree_sf_tray_view">-->
-<!--            <field name="name">sf.tray.tree</field>-->
-<!--            <field name="model">sf.tray</field>-->
-<!--            <field name="arch" type="xml">-->
-<!--                <tree string="托盘">-->
-<!--                    <field name="code"/>-->
-<!--                    <field name="name"/>-->
-<!--                    <field name="state"/>-->
-<!--                </tree>-->
-<!--            </field>-->
-<!--        </record>-->
-
-        <record model="ir.ui.view" id="sf_tray_form">
-            <field name="name">sf.tray.form</field>
-            <field name="model">sf.tray</field>
-            <field name="arch" type="xml">
-                <form string="托盘">
-                    <header>
-                        <field name='state' widget="radio" options="{'horizontal': True}"/>
-                    </header>
-                    <sheet>
-                        <div class="oe_title">
-                            <h1>
-                                <field name="code"/>
-                            </h1>
-                        </div>
-                        <group name="group1">
-                            <group>
-                                <field name="name" required="1" string="名称"/>
-                            </group>
-                        </group>
-                    </sheet>
-                </form>
-            </field>
-        </record>
-=======
 <!--        <record model="ir.ui.view" id="sf_tray_form">-->
 <!--            <field name="name">sf.tray.form</field>-->
 <!--            <field name="model">sf.tray</field>-->
@@ -451,6 +374,5 @@
 <!--                </form>-->
 <!--            </field>-->
 <!--        </record>-->
->>>>>>> ae07a515b7846f3ab9dea426ae5a88c0472cf6b6
     </data>
 </odoo>
\ No newline at end of file
diff --git a/sf_tool_management/views/tool_base_views.xml b/sf_tool_management/views/tool_base_views.xml
index 04f06b27..02ab3ce6 100644
--- a/sf_tool_management/views/tool_base_views.xml
+++ b/sf_tool_management/views/tool_base_views.xml
@@ -84,7 +84,7 @@
                                         <field name="integral_blade_length"/>
                                         <field name="effective_blade_length"/>
                                         <field name="max_life"/>
-                                        <field name="is_standard"/>
+                                        <field name="is_standard" default="false"/>
                                         <field name="applicable_range"/>
                                     </group>
                                 </group>
@@ -236,7 +236,7 @@
                                         <field name="integral_blade_length"/>
                                         <field name="effective_blade_length"/>
                                         <field name="max_life"/>
-                                        <field name="is_standard"/>
+                                        <field name="is_standard" default="false"/>
                                         <field name="applicable_range"/>
                                     </group>
                                 </group>
@@ -409,7 +409,7 @@
                                         <field name="integral_blade_length"/>
                                         <field name="effective_blade_length"/>
                                         <field name="max_life"/>
-                                        <field name="is_standard"/>
+                                        <field name="is_standard" default="false"/>
                                         <field name="applicable_range"/>
                                     </group>
                                 </group>
@@ -544,7 +544,7 @@
                                         <field name="integral_blade_length"/>
                                         <field name="effective_blade_length"/>
                                         <field name="max_life"/>
-                                        <field name="is_standard"/>
+                                        <field name="is_standard" default="false"/>
                                         <field name="applicable_range"/>
                                     </group>
                                 </group>

From c92442672579ec5b4225e67945aa6b6710bee43c Mon Sep 17 00:00:00 2001
From: "qihao.gong@jikimo.com" <qihao.gong@jikimo.com>
Date: Fri, 18 Aug 2023 14:31:28 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E5=93=81=E7=89=8C=E5=A4=87=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_base/views/base_view.xml                 | 3 +--
 sf_mrs_connect/models/res_config_setting.py | 6 +++---
 sf_mrs_connect/models/sync_common.py        | 5 ++++-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/sf_base/views/base_view.xml b/sf_base/views/base_view.xml
index fa071acc..4425ae13 100644
--- a/sf_base/views/base_view.xml
+++ b/sf_base/views/base_view.xml
@@ -27,9 +27,8 @@
             <tree string="品牌" create="0" edit="0" delete="0">
                 <field name="code"/>
                 <field name="name"/>
-                <field name="manufacturer_model_number"/>
                 <field name="tag_ids" widget="many2many_tags" optional="hide"/>
-                <field name="image_brand"/>
+                <field name="remark"/>
             </tree>
         </field>
     </record>
diff --git a/sf_mrs_connect/models/res_config_setting.py b/sf_mrs_connect/models/res_config_setting.py
index 79ecbbd9..02f30a30 100644
--- a/sf_mrs_connect/models/res_config_setting.py
+++ b/sf_mrs_connect/models/res_config_setting.py
@@ -45,13 +45,13 @@ class ResConfigSettings(models.TransientModel):
             self.env['sf.cutting.tool.material'].sync_all_cutting_tool_material()
             _logger.info("同步所有刀具物料完成")
             _logger.info("同步所有刀具类型...")
-            self.env['sf.cutting.tool.type'].sync_all_tool_type()
-            _logger.info("同步所有刀具类型完成")
+            # self.env['sf.cutting.tool.type'].sync_all_tool_type()
+            # _logger.info("同步所有刀具类型完成")
             _logger.info("定时同步所有功能刀具类型列表...")
             self.env['sf.functional.cutting.tool.model'].sync_all_functional_cutting_tool_model()
             _logger.info("同步所有功能刀具类型完成")
             _logger.info("同步所有刀具型号...")
-            self.env['sf.cutting.tool.model'].sync_all_tool_model()
+            # self.env['sf.cutting.tool.model'].sync_all_tool_model()
             _logger.info("同步所有刀具型号完成")
             _logger.info("同步所有功能刀具列表...")
             self.env['sf.functional.cutting.tool'].sync_all_functional_cutting_tool()
diff --git a/sf_mrs_connect/models/sync_common.py b/sf_mrs_connect/models/sync_common.py
index 583fd6e4..0d2b065c 100644
--- a/sf_mrs_connect/models/sync_common.py
+++ b/sf_mrs_connect/models/sync_common.py
@@ -529,7 +529,8 @@ class MachineBrand(models.Model):
                     brand.code = item['code'],
                     brand.image_brand = '' if not item['image_brand'] else base64.b64encode(item.image_brand),
                     brand.manufacturer_model_number = item['manufacturer_model_number'],
-                    brand.active = item['active']
+                    brand.active = item['active'],
+                    brand.remark = item['remark'],
                 else:
                     self.env['sf.machine.brand'].create({
                         "id": item['id'],
@@ -538,6 +539,7 @@ class MachineBrand(models.Model):
                         "image_brand": '' if not item['image_brand'] else base64.b64encode(item.image_brand),
                         "manufacturer_model_number": item['manufacturer_model_number'],
                         "active": item['active'],
+                        "remark": item['remark'],
 
                     })
         else:
@@ -564,6 +566,7 @@ class MachineBrand(models.Model):
                         "id": item['id'],
                         "name": item['name'],
                         "code": item['code'],
+                        "remark": item['remark'],
                         "manufacturer_model_number": item['manufacturer_model_number'],
                         "image_brand": '' if not item['image_brand'] else base64.b64encode(item.image_brand),
                         "tag_ids": self.env['sf.machine.brand.tags'].search(

From f88dd790a0286847b55e22bab5814a13beca0a07 Mon Sep 17 00:00:00 2001
From: yuxianghui <1608204036@qq.com>
Date: Fri, 18 Aug 2023 15:11:36 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=BA=BF=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=85=B3=E8=81=94=E5=B7=A5=E4=BD=9C=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=8C=E4=BC=98=E5=8C=96=E7=9C=8B=E6=9D=BF?=
 =?UTF-8?q?=E5=92=8Cform=E8=A7=86=E5=9B=BE=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../models/production_line_base.py             |  4 +++-
 .../views/production_line_view.xml             | 18 +++++++++++-------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/sf_manufacturing/models/production_line_base.py b/sf_manufacturing/models/production_line_base.py
index f9a30d36..a8c41cd3 100644
--- a/sf_manufacturing/models/production_line_base.py
+++ b/sf_manufacturing/models/production_line_base.py
@@ -21,10 +21,12 @@ class ProductionLine(models.Model):
             num = "%03d" % m
         return num
 
-    name = fields.Char('生产线')
+    mrp_workcenter_ids = fields.One2many('mrp.workcenter', 'production_line_id', '工作中心')
+    name = fields.Char('生产线', size=20, required=True)
     code = fields.Char('编码', default=_get_code, readonly=True)
     remark = fields.Char('备注')
 
 
 
 
+
diff --git a/sf_manufacturing/views/production_line_view.xml b/sf_manufacturing/views/production_line_view.xml
index b9fd459f..f12f6d98 100644
--- a/sf_manufacturing/views/production_line_view.xml
+++ b/sf_manufacturing/views/production_line_view.xml
@@ -5,8 +5,9 @@
         <field name="model">sf.production.line</field>
         <field name="arch" type="xml">
             <tree string="生产线">
-                <field name="name"/>
                 <field name="code"/>
+                <field name="name"/>
+                <field name="mrp_workcenter_ids" widget="many2many_tags"/>
                 <field name="remark"/>
             </tree>
         </field>
@@ -18,13 +19,16 @@
         <field name="arch" type="xml">
             <form string="生产线">
                 <sheet>
+                    <div class="oe_title">
+                        <h1>
+                            <field name="name"/>
+                        </h1>
+                    </div>
                     <group>
-                        <group>
-                            <field name="name"/>
-                            <field name="remark"/>
-                        </group>
                         <group>
                             <field name="code"/>
+                            <field name="mrp_workcenter_ids" widget="many2many_tags"/>
+                            <field name="remark"/>
                         </group>
                     </group>
                 </sheet>
@@ -54,8 +58,8 @@
                         <!-- 在这里定义每个卡片的内容 -->
                         <div>
                             <strong><field name="code"/></strong>
-                            <br/>
-                            <span><field name="name"/></span>
+                            <span><h1><field name="name"/></h1></span>
+                            <field name="mrp_workcenter_ids" widget="many2many_tags"/>
                             <br/>
                             <span><field name="remark"/></span>
                         </div>