From 3b7e120eb2eb2cbd511f988613d7e418450d5b5c Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Fri, 15 Mar 2024 17:38:43 +0800
Subject: [PATCH 1/9] =?UTF-8?q?1=E3=80=81=E4=BC=98=E5=8C=96=E5=A4=B9?=
 =?UTF-8?q?=E5=85=B7=E5=9E=8B=E5=8F=B7=E9=9D=99=E6=80=81=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_base/models/basic_parameters_fixture.py    | 427 ++++++++++--------
 sf_base/models/fixture.py                     |   4 +-
 sf_base/views/fixture_view.xml                |   7 +
 sf_mrs_connect/models/sync_common.py          | 285 +++++-------
 .../models/functional_tool_enroll.py          |   6 +
 5 files changed, 381 insertions(+), 348 deletions(-)

diff --git a/sf_base/models/basic_parameters_fixture.py b/sf_base/models/basic_parameters_fixture.py
index 7bd69a35..362b5abf 100644
--- a/sf_base/models/basic_parameters_fixture.py
+++ b/sf_base/models/basic_parameters_fixture.py
@@ -67,186 +67,259 @@ class BasicParametersFixture(models.Model):
     mounting_hole_depth = fields.Float('安装孔深度(mm)', digits=(16, 2))
     centering_diameter = fields.Float('定心直径(mm)', digits=(16, 2))
 
-    def _json_zero_chuck_param(self, obj):
-        zero_chuck_param_str = (0, '', {
-            'name': obj['name'],
-            'length': obj['length'],
-            'width': obj['width'],
-            'height': obj['height'],
-            'diameter': obj['diameter'],
-            'weight': obj['weight'],
-            'orientation_dish_diameter': obj['orientation_dish_diameter'],
-            'clamping_diameter': obj['clamping_diameter'],
-            'clamping_num': obj['clamping_num'],
-            'chucking_power_max': obj['chucking_power_max'],
-            'repeated_positioning_accuracy': obj['repeated_positioning_accuracy'],
-            'boolean_transposing_hole': obj['boolean_transposing_hole'],
-            'unlocking_method': obj['unlocking_method'],
-            'boolean_chip_blowing_function': obj['boolean_chip_blowing_function'],
-            'carrying_capacity_max': obj['carrying_capacity_max'],
-            'rigidity': obj['rigidity'],
-            'materials_model_id': self.env['sf.materials.model'].sudo().search(
-                [('materials_no', '=', obj['materials_model_id']), ('active', '=', True)]).id,
-            'machine_tool_type_id': self.env['sf.machine_tool.type'].sudo().search(
-                [('code', '=', obj['machine_tool_type_id']), ('active', '=', True)]).id,
-        })
-        return zero_chuck_param_str
+    code = fields.Char('编码')
 
-    def _json_zero_tray_param(self, obj):
-        zero_tray_param_str = (0, '', {
-            'name': obj['name'],
-            'length': obj['length'],
-            'width': obj['width'],
-            'height': obj['height'],
-            'diameter': obj['diameter'],
-            'weight': obj['weight'],
-            'clamping_diameter': obj['clamping_diameter'],
-            'connector_diameter': obj['connector_diameter'],
-            'chucking_power_max': obj['chucking_power_max'],
-            'repeated_positioning_accuracy': obj['repeated_positioning_accuracy'],
-            'boolean_chip_blowing_function': obj['boolean_chip_blowing_function'],
-            'way_to_install': obj['way_to_install'],
-            'type_of_drive': obj['type_of_drive'],
-            'carrying_capacity_max': obj['carrying_capacity_max'],
-            'materials_model_id': self.env['sf.materials.model'].sudo().search(
-                [('materials_no', '=', obj['materials_model_id']), ('active', '=', True)]).id,
-            'rigidity': obj['rigidity'],
-        })
-        return zero_tray_param_str
+    def create_fixture_materials(self, fixture_materials_datas, fixture_model):
+        fixture_materials_name = fixture_model.fixture_material_id.name
+        if fixture_materials_name == '零点卡盘':
+            for fixture_materials_data in fixture_materials_datas:
+                self.create(self._json_zero_chuck_param(fixture_materials_data, fixture_model))
+        elif fixture_materials_name == '零点托盘':
+            for fixture_materials_data in fixture_materials_datas:
+                self.create(self._json_zero_tray_param(fixture_materials_data, fixture_model))
+        elif fixture_materials_name == '气动夹具':
+            for fixture_materials_data in fixture_materials_datas:
+                self.create(self._json_pneumatic_fixture_param(fixture_materials_data, fixture_model))
+        elif fixture_materials_name == '虎钳夹具':
+            for fixture_materials_data in fixture_materials_datas:
+                self.create(self._json_jaw_vice_fixture_param(fixture_materials_data, fixture_model))
+        elif fixture_materials_name == '磁吸夹具':
+            for fixture_materials_data in fixture_materials_datas:
+                self.create(self._json_magnet_fixture_param(fixture_materials_data, fixture_model))
+        elif fixture_materials_name == '转接板(锁板)夹具':
+            for fixture_materials_data in fixture_materials_datas:
+                self.create(self._json_adapter_board_fixture_param(fixture_materials_data, fixture_model))
+        elif fixture_materials_name == '三爪卡盘':
+            for fixture_materials_data in fixture_materials_datas:
+                self.create(self._json_scroll_chuck_param(fixture_materials_data, fixture_model))
 
-    def _json_pneumatic_fixture_param(self, obj):
-        pneumatic_fixture_param_str = (0, '', {
-            'name': obj['name'],
-            'length': obj['length'],
-            'width': obj['width'],
-            'height': obj['height'],
-            'weight': obj['weight'],
-            'gripper_length_min': obj['gripper_length_min'],
-            'gripper_width_min': obj['gripper_width_min'],
-            'gripper_height_min': obj['gripper_height_min'],
-            'gripper_diameter_min': obj['gripper_diameter_min'],
-            'gripper_length_max': obj['gripper_length_max'],
-            'gripper_width_max': obj['gripper_width_max'],
-            'gripper_height_max': obj['gripper_height_max'],
-            'gripper_diameter_max': obj['gripper_diameter_max'],
-            'chucking_power_max': obj['chucking_power_max'],
-            'carrying_capacity_max': obj['carrying_capacity_max'],
-            'rated_air_pressure': obj['rated_air_pressure'],
-            'materials_model_id': self.env['sf.materials.model'].sudo().search(
-                [('materials_no', '=', obj['materials_model_id']), ('active', '=', True)]).id,
-            'rigidity': obj['rigidity'],
-            'interface_materials_model_id': self.env['sf.materials.model'].sudo().search(
-                [('materials_no', '=', obj['materials_model_id']), ('active', '=', True)]).id,
-            'type_of_drive': obj['type_of_drive'],
-        })
-        return pneumatic_fixture_param_str
+    def write_fixture_materials(self, fixture_materials_datas, fixture_materials_name):
+        # 同步过来的cloud夹具物料的code
+        mrs_fixture_materials_codes = []
+        for fixture_materials_data in fixture_materials_datas:
+            mrs_fixture_materials_codes.append(fixture_materials_data.get('code'))
 
-    def _json_jaw_vice_fixture_param(self, obj):
-        jaw_vice_fixture_param_str = (0, '', {
-            'name': obj['name'],
-            'length': obj['length'],
-            'width': obj['width'],
-            'height': obj['height'],
-            'weight': obj['weight'],
-            'gripper_length_min': obj['gripper_length_min'],
-            'gripper_width_min': obj['gripper_width_min'],
-            'gripper_height_min': obj['gripper_height_min'],
-            'gripper_diameter_min': obj['gripper_diameter_min'],
-            'gripper_length_max': obj['gripper_length_max'],
-            'gripper_width_max': obj['gripper_width_max'],
-            'gripper_height_max': obj['gripper_height_max'],
-            'gripper_diameter_max': obj['gripper_diameter_max'],
-            'chucking_power_max': obj['chucking_power_max'],
-            'carrying_capacity_max': obj['carrying_capacity_max'],
-            'transverse_groove': obj['transverse_groove'],
-            'longitudinal_fitting_groove': obj['longitudinal_fitting_groove'],
-            'materials_model_id': self.env['sf.materials.model'].sudo().search(
-                [('materials_no', '=', obj['materials_model_id']), ('active', '=', True)]).id,
-            'rigidity': obj['rigidity'],
-            'interface_materials_model_id': self.env['sf.materials.model'].sudo().search(
-                [('materials_no', '=', obj['materials_model_id']), ('active', '=', True)]).id,
-            'type_of_drive': obj['type_of_drive'],
-        })
-        return jaw_vice_fixture_param_str
+        for fixture_materials_data in fixture_materials_datas:
+            sf_materials_model_codes = []
+            # 判断sf夹具型号关联的夹具物料在同步过来的mrs夹具物料中是否存在，如果存在则修改，不存在则删除
+            data = self._get_fixture_materials_list(fixture_materials_data, fixture_materials_name)
+            for zero_chuck_id in data[1]:
+                code = zero_chuck_id.code
+                if code in mrs_fixture_materials_codes:
+                    self.search([('code', '=', code)]).sudo().write(data[0])
+                    sf_materials_model_codes.append(code)
+                else:
+                    self.search([('code', '=', code)]).sudo().unlink()
+            # 判断同步过来的mrs刀具物料在sf夹具型号关联的夹具物料中是否存在，如果不存在则创建
+            for mrs_fixture_materials_code in mrs_fixture_materials_codes:
+                if mrs_fixture_materials_code not in sf_materials_model_codes:
+                    self.sudo().create(data[0])
 
-    def _json_magnet_fixture_param(self, obj):
-        magnet_fixture_param_str = (0, '', {
-            'name': obj['name'],
-            'length': obj['length'],
-            'width': obj['width'],
-            'height': obj['height'],
-            'height_tolerance_value': obj['height_tolerance_value'],
-            'weight': obj['weight'],
-            'gripper_length_min': obj['gripper_length_min'],
-            'gripper_width_min': obj['gripper_width_min'],
-            'gripper_height_min': obj['gripper_height_min'],
-            'gripper_diameter_min': obj['gripper_diameter_min'],
-            'gripper_length_max': obj['gripper_length_max'],
-            'gripper_width_max': obj['gripper_width_max'],
-            'gripper_height_max': obj['gripper_height_max'],
-            'gripper_diameter_max': obj['gripper_diameter_max'],
-            'rated_adsorption_force': obj['rated_adsorption_force'],
-            'magnetic_field_height': obj['magnetic_field_height'],
-            'magnetic_pole_plate_grinding_allowance': obj['magnetic_pole_plate_grinding_allowance'],
-            'carrying_capacity_max': obj['carrying_capacity_max'],
-            'materials_model_id': self.env['sf.materials.model'].sudo().search(
-                [('materials_no', '=', obj['materials_model_id']), ('active', '=', True)]).id,
-            'rigidity': obj['rigidity'],
-            'interface_materials_model_id': self.env['sf.materials.model'].sudo().search(
-                [('materials_no', '=', obj['materials_model_id']), ('active', '=', True)]).id,
-            'type_of_drive': obj['type_of_drive'],
-        })
-        return magnet_fixture_param_str
+    def _get_fixture_materials_list(self, fixture_materials_data, fixture_materials_name):
+        fixture_model = self.env['sf.fixture.model'].sudo().search(
+            [('code', '=', fixture_materials_data['fixture_model_code']), ('active', '=', True)])
+        if fixture_materials_name == '零点卡盘':
+            materials_list = self._json_zero_chuck_param(fixture_materials_data, fixture_model)
+            return [materials_list, fixture_model.zero_chuck_ids]
+        elif fixture_materials_name == '零点托盘':
+            materials_list = self._json_zero_tray_param(fixture_materials_data, fixture_model)
+            return [materials_list, fixture_model.zero_tray_ids]
+        elif fixture_materials_name == '气动夹具':
+            materials_list = self._json_pneumatic_fixture_param(fixture_materials_data, fixture_model)
+            return [materials_list, fixture_model.pneumatic_fixture_ids]
+        elif fixture_materials_name == '虎钳夹具':
+            materials_list = self._json_jaw_vice_fixture_param(fixture_materials_data, fixture_model)
+            return [materials_list, fixture_model.pneumatic_fixture_ids]
+        elif fixture_materials_name == '磁吸夹具':
+            materials_list = self._json_magnet_fixture_param(fixture_materials_data, fixture_model)
+            return [materials_list, fixture_model.magnet_fixture_ids]
+        elif fixture_materials_name == '转接板(锁板)夹具':
+            materials_list = self._json_adapter_board_fixture_param(fixture_materials_data, fixture_model)
+            return [materials_list, fixture_model.adapter_board_fixture_ids]
+        elif fixture_materials_name == '三爪卡盘':
+            materials_list = self._json_scroll_chuck_param(fixture_materials_data, fixture_model)
+            return [materials_list, fixture_model.scroll_chuck_ids]
 
-    def _json_adapter_board_fixture_param(self, obj):
-        adapter_board_fixture_param_str = (0, '', {
-            'name': obj['name'],
-            'length': obj['length'],
-            'width': obj['width'],
-            'height': obj['height'],
-            'weight': obj['weight'],
-            'gripper_length_min': obj['gripper_length_min'],
-            'gripper_width_min': obj['gripper_width_min'],
-            'gripper_height_min': obj['gripper_height_min'],
-            'gripper_diameter_min': obj['gripper_diameter_min'],
-            'gripper_length_max': obj['gripper_length_max'],
-            'gripper_width_max': obj['gripper_width_max'],
-            'gripper_height_max': obj['gripper_height_max'],
-            'gripper_diameter_max': obj['gripper_diameter_max'],
-            'chucking_power_max': obj['chucking_power_max'],
-            'carrying_capacity_max': obj['carrying_capacity_max'],
-            'materials_model_id': self.env['sf.materials.model'].sudo().search(
-                [('materials_no', '=', obj['materials_model_id']), ('active', '=', True)]).id,
-            'rigidity': obj['rigidity'],
-            'screw_size': obj['screw_size'],
-            'via_hole_diameter': obj['via_hole_diameter'],
-            'type_of_drive': obj['type_of_drive'],
-        })
-        return adapter_board_fixture_param_str
+    def _json_zero_chuck_param(self, obj, fixture_model):
+        """零点卡盘：将data数据转换成list数据"""
+        return {'code': obj['code'],
+                'fixture_model_id': fixture_model.id,
+                'name': obj['name'],
+                'length': obj['length'],
+                'width': obj['width'],
+                'height': obj['height'],
+                'diameter': obj['diameter'],
+                'weight': obj['weight'],
+                'orientation_dish_diameter': obj['orientation_dish_diameter'],
+                'clamping_diameter': obj['clamping_diameter'],
+                'clamping_num': obj['clamping_num'],
+                'chucking_power_max': obj['chucking_power_max'],
+                'repeated_positioning_accuracy': obj['repeated_positioning_accuracy'],
+                'boolean_transposing_hole': obj['boolean_transposing_hole'],
+                'unlocking_method': obj['unlocking_method'],
+                'boolean_chip_blowing_function': obj['boolean_chip_blowing_function'],
+                'carrying_capacity_max': obj['carrying_capacity_max'],
+                'rigidity': obj['rigidity'],
+                'materials_model_id': self.env['sf.materials.model'].sudo().search(
+                    [('materials_no', '=', obj['materials_model_id']), ('active', '=', True)]).id,
+                'machine_tool_type_id': self.env['sf.machine_tool.type'].sudo().search(
+                    [('code', '=', obj['machine_tool_type_id']), ('active', '=', True)]).id}
 
-    def _json_scroll_chuck_param(self, obj):
-        scroll_chuck_param_str = (0, '', {
-            'name': obj['name'],
-            'length': obj['length'],
-            'width': obj['width'],
-            'height': obj['height'],
-            'diameter': obj['diameter'],
-            'weight': obj['weight'],
-            'gripper_length_min': obj['gripper_length_min'],
-            'gripper_width_min': obj['gripper_width_min'],
-            'gripper_height_min': obj['gripper_height_min'],
-            'gripper_diameter_min': obj['gripper_diameter_min'],
-            'gripper_length_max': obj['gripper_length_max'],
-            'gripper_width_max': obj['gripper_width_max'],
-            'gripper_height_max': obj['gripper_height_max'],
-            'gripper_diameter_max': obj['gripper_diameter_max'],
-            'chucking_power_max': obj['chucking_power_max'],
-            'carrying_capacity_max': obj['carrying_capacity_max'],
-            'materials_model_id': self.env['sf.materials.model'].sudo().search(
-                [('materials_no', '=', obj['materials_model_id']), ('active', '=', True)]).id,
-            'rigidity': obj['rigidity'],
-            'mounting_hole_depth': obj['mounting_hole_depth'],
-            'centering_diameter': obj['centering_diameter'],
-            'type_of_drive': obj['type_of_drive'],
-        })
-        return scroll_chuck_param_str
+    def _json_zero_tray_param(self, obj, fixture_model):
+        """零点托盘：将data数据转换成list数据"""
+        return {'code': obj['code'],
+                'fixture_model_id': fixture_model.id,
+                'name': obj['name'],
+                'length': obj['length'],
+                'width': obj['width'],
+                'height': obj['height'],
+                'diameter': obj['diameter'],
+                'weight': obj['weight'],
+                'clamping_diameter': obj['clamping_diameter'],
+                'connector_diameter': obj['connector_diameter'],
+                'chucking_power_max': obj['chucking_power_max'],
+                'repeated_positioning_accuracy': obj['repeated_positioning_accuracy'],
+                'boolean_chip_blowing_function': obj['boolean_chip_blowing_function'],
+                'way_to_install': obj['way_to_install'],
+                'type_of_drive': obj['type_of_drive'],
+                'carrying_capacity_max': obj['carrying_capacity_max'],
+                'materials_model_id': self.env['sf.materials.model'].sudo().search(
+                    [('materials_no', '=', obj['materials_model_id']), ('active', '=', True)]).id,
+                'rigidity': obj['rigidity']}
+
+    def _json_pneumatic_fixture_param(self, obj, fixture_model):
+        """气动夹具：将data数据转换成list数据"""
+        return {'code': obj['code'],
+                'fixture_model_id': fixture_model.id,
+                'name': obj['name'],
+                'length': obj['length'],
+                'width': obj['width'],
+                'height': obj['height'],
+                'weight': obj['weight'],
+                'gripper_length_min': obj['gripper_length_min'],
+                'gripper_width_min': obj['gripper_width_min'],
+                'gripper_height_min': obj['gripper_height_min'],
+                'gripper_diameter_min': obj['gripper_diameter_min'],
+                'gripper_length_max': obj['gripper_length_max'],
+                'gripper_width_max': obj['gripper_width_max'],
+                'gripper_height_max': obj['gripper_height_max'],
+                'gripper_diameter_max': obj['gripper_diameter_max'],
+                'chucking_power_max': obj['chucking_power_max'],
+                'carrying_capacity_max': obj['carrying_capacity_max'],
+                'rated_air_pressure': obj['rated_air_pressure'],
+                'materials_model_id': self.env['sf.materials.model'].sudo().search(
+                    [('materials_no', '=', obj['materials_model_id']), ('active', '=', True)]).id,
+                'rigidity': obj['rigidity'],
+                'interface_materials_model_id': self.env['sf.materials.model'].sudo().search(
+                    [('materials_no', '=', obj['materials_model_id']), ('active', '=', True)]).id,
+                'type_of_drive': obj['type_of_drive']}
+
+    def _json_jaw_vice_fixture_param(self, obj, fixture_model):
+        """虎钳夹具：将data数据转换成list数据"""
+        return {'code': obj['code'],
+                'fixture_model_id': fixture_model.id,
+                'name': obj['name'],
+                'length': obj['length'],
+                'width': obj['width'],
+                'height': obj['height'],
+                'weight': obj['weight'],
+                'gripper_length_min': obj['gripper_length_min'],
+                'gripper_width_min': obj['gripper_width_min'],
+                'gripper_height_min': obj['gripper_height_min'],
+                'gripper_diameter_min': obj['gripper_diameter_min'],
+                'gripper_length_max': obj['gripper_length_max'],
+                'gripper_width_max': obj['gripper_width_max'],
+                'gripper_height_max': obj['gripper_height_max'],
+                'gripper_diameter_max': obj['gripper_diameter_max'],
+                'chucking_power_max': obj['chucking_power_max'],
+                'carrying_capacity_max': obj['carrying_capacity_max'],
+                'transverse_groove': obj['transverse_groove'],
+                'longitudinal_fitting_groove': obj['longitudinal_fitting_groove'],
+                'materials_model_id': self.env['sf.materials.model'].sudo().search(
+                    [('materials_no', '=', obj['materials_model_id']), ('active', '=', True)]).id,
+                'rigidity': obj['rigidity'],
+                'interface_materials_model_id': self.env['sf.materials.model'].sudo().search(
+                    [('materials_no', '=', obj['materials_model_id']), ('active', '=', True)]).id,
+                'type_of_drive': obj['type_of_drive']}
+
+    def _json_magnet_fixture_param(self, obj, fixture_model):
+        """磁吸夹具：将data数据转换成list数据"""
+        return {'code': obj['code'],
+                'fixture_model_id': fixture_model.id,
+                'name': obj['name'],
+                'length': obj['length'],
+                'width': obj['width'],
+                'height': obj['height'],
+                'height_tolerance_value': obj['height_tolerance_value'],
+                'weight': obj['weight'],
+                'gripper_length_min': obj['gripper_length_min'],
+                'gripper_width_min': obj['gripper_width_min'],
+                'gripper_height_min': obj['gripper_height_min'],
+                'gripper_diameter_min': obj['gripper_diameter_min'],
+                'gripper_length_max': obj['gripper_length_max'],
+                'gripper_width_max': obj['gripper_width_max'],
+                'gripper_height_max': obj['gripper_height_max'],
+                'gripper_diameter_max': obj['gripper_diameter_max'],
+                'rated_adsorption_force': obj['rated_adsorption_force'],
+                'magnetic_field_height': obj['magnetic_field_height'],
+                'magnetic_pole_plate_grinding_allowance': obj['magnetic_pole_plate_grinding_allowance'],
+                'carrying_capacity_max': obj['carrying_capacity_max'],
+                'materials_model_id': self.env['sf.materials.model'].sudo().search(
+                    [('materials_no', '=', obj['materials_model_id']), ('active', '=', True)]).id,
+                'rigidity': obj['rigidity'],
+                'interface_materials_model_id': self.env['sf.materials.model'].sudo().search(
+                    [('materials_no', '=', obj['materials_model_id']), ('active', '=', True)]).id,
+                'type_of_drive': obj['type_of_drive']}
+
+    def _json_adapter_board_fixture_param(self, obj, fixture_model):
+        """转接板(锁板)夹具：将data数据转换成list数据"""
+        return {'code': obj['code'],
+                'fixture_model_id': fixture_model.id,
+                'name': obj['name'],
+                'length': obj['length'],
+                'width': obj['width'],
+                'height': obj['height'],
+                'weight': obj['weight'],
+                'gripper_length_min': obj['gripper_length_min'],
+                'gripper_width_min': obj['gripper_width_min'],
+                'gripper_height_min': obj['gripper_height_min'],
+                'gripper_diameter_min': obj['gripper_diameter_min'],
+                'gripper_length_max': obj['gripper_length_max'],
+                'gripper_width_max': obj['gripper_width_max'],
+                'gripper_height_max': obj['gripper_height_max'],
+                'gripper_diameter_max': obj['gripper_diameter_max'],
+                'chucking_power_max': obj['chucking_power_max'],
+                'carrying_capacity_max': obj['carrying_capacity_max'],
+                'materials_model_id': self.env['sf.materials.model'].sudo().search(
+                    [('materials_no', '=', obj['materials_model_id']), ('active', '=', True)]).id,
+                'rigidity': obj['rigidity'],
+                'screw_size': obj['screw_size'],
+                'via_hole_diameter': obj['via_hole_diameter'],
+                'type_of_drive': obj['type_of_drive']}
+
+    def _json_scroll_chuck_param(self, obj, fixture_model):
+        """转接板(锁板)夹具：将data数据转换成list数据"""
+        return {'code': obj['code'],
+                'fixture_model_id': fixture_model.id,
+                'name': obj['name'],
+                'length': obj['length'],
+                'width': obj['width'],
+                'height': obj['height'],
+                'diameter': obj['diameter'],
+                'weight': obj['weight'],
+                'gripper_length_min': obj['gripper_length_min'],
+                'gripper_width_min': obj['gripper_width_min'],
+                'gripper_height_min': obj['gripper_height_min'],
+                'gripper_diameter_min': obj['gripper_diameter_min'],
+                'gripper_length_max': obj['gripper_length_max'],
+                'gripper_width_max': obj['gripper_width_max'],
+                'gripper_height_max': obj['gripper_height_max'],
+                'gripper_diameter_max': obj['gripper_diameter_max'],
+                'chucking_power_max': obj['chucking_power_max'],
+                'carrying_capacity_max': obj['carrying_capacity_max'],
+                'materials_model_id': self.env['sf.materials.model'].sudo().search(
+                    [('materials_no', '=', obj['materials_model_id']), ('active', '=', True)]).id,
+                'rigidity': obj['rigidity'],
+                'mounting_hole_depth': obj['mounting_hole_depth'],
+                'centering_diameter': obj['centering_diameter'],
+                'type_of_drive': obj['type_of_drive']}
diff --git a/sf_base/models/fixture.py b/sf_base/models/fixture.py
index 52e2baf7..0102b296 100644
--- a/sf_base/models/fixture.py
+++ b/sf_base/models/fixture.py
@@ -27,9 +27,9 @@ class FixtureModel(models.Model):
     _description = "夹具型号"
 
     name = fields.Char(string="名称", size=50, required=True)
-    fixture_material_id = fields.Many2one('sf.fixture.material', string="夹具物料", required=True)
+    fixture_material_id = fields.Many2one('sf.fixture.material', string="夹具物料")
     fixture_material_type = fields.Char(string="夹具物料类型", related='fixture_material_id.name')
-    multi_mounting_type_id = fields.Many2one('sf.multi_mounting.type', string="联装类型", required=True)
+    multi_mounting_type_id = fields.Many2one('sf.multi_mounting.type', string="联装类型")
     brand_id = fields.Many2one('sf.machine.brand', string="品牌")
     model_file = fields.Binary(string="图片")
     status = fields.Boolean('状态')
diff --git a/sf_base/views/fixture_view.xml b/sf_base/views/fixture_view.xml
index 692c3b7f..fffa2a65 100644
--- a/sf_base/views/fixture_view.xml
+++ b/sf_base/views/fixture_view.xml
@@ -165,6 +165,7 @@
                             <field name="zero_chuck_ids"
                                    attrs="{'invisible': [('fixture_material_type', '!=', '零点卡盘')]}">
                                 <tree editable="bottom" class="center" delete="0">
+                                    <field name="code"/>
                                     <field name="name"/>
                                     <field name="length"/>
                                     <field name="width"/>
@@ -190,6 +191,7 @@
                             <field name="zero_tray_ids"
                                    attrs="{'invisible': [('fixture_material_type', '!=', '零点托盘')]}">
                                 <tree editable="bottom" class="center" delete="0">
+                                    <field name="code"/>
                                     <field name="name"/>
                                     <field name="length"/>
                                     <field name="width"/>
@@ -213,6 +215,7 @@
                             <field name="pneumatic_fixture_ids"
                                    attrs="{'invisible': [('fixture_material_type', '!=', '气动夹具')]}">
                                 <tree editable="bottom" class="center" delete="0">
+                                    <field name="code"/>
                                     <field name="name"/>
                                     <field name="length"/>
                                     <field name="width"/>
@@ -240,6 +243,7 @@
                             <field name="jaw_vice_fixture_ids"
                                    attrs="{'invisible': [('fixture_material_type', '!=', '虎钳夹具')]}">
                                 <tree editable="bottom" class="center" delete="0">
+                                    <field name="code"/>
                                     <field name="name"/>
                                     <field name="length"/>
                                     <field name="width"/>
@@ -268,6 +272,7 @@
                             <field name="magnet_fixture_ids"
                                    attrs="{'invisible': [('fixture_material_type', '!=', '磁吸夹具')]}">
                                 <tree editable="bottom" class="center" delete="0">
+                                    <field name="code"/>
                                     <field name="name"/>
                                     <field name="length"/>
                                     <field name="width"/>
@@ -297,6 +302,7 @@
                             <field name="adapter_board_fixture_ids"
                                    attrs="{'invisible': [('fixture_material_type', '!=', '转接板(锁板)夹具')]}">
                                 <tree editable="bottom" class="center" delete="0">
+                                    <field name="code"/>
                                     <field name="name"/>
                                     <field name="length"/>
                                     <field name="width"/>
@@ -323,6 +329,7 @@
                             <field name="scroll_chuck_ids"
                                    attrs="{'invisible': [('fixture_material_type', '!=', '三爪卡盘')]}">
                                 <tree editable="bottom" class="center" delete="0">
+                                    <field name="code"/>
                                     <field name="name"/>
                                     <field name="length"/>
                                     <field name="width"/>
diff --git a/sf_mrs_connect/models/sync_common.py b/sf_mrs_connect/models/sync_common.py
index d9e310e0..06f73e53 100644
--- a/sf_mrs_connect/models/sync_common.py
+++ b/sf_mrs_connect/models/sync_common.py
@@ -827,7 +827,8 @@ class MachineToolType(models.Model):
                 brand = self.env['sf.machine.brand'].search([('code', '=', item['brand_id'])])
                 jg_image_id = self.env['maintenance.equipment.image'].search([('name', 'in', item['jg_image_id'])]).ids
                 lq_image_id = self.env['maintenance.equipment.image'].search([('name', 'in', item['lq_image_id'])]).ids
-                category = self.env['sf.machine_tool.category'].search([('code', '=', item['machine_tool_category']), ('active', '=', True)], limit=1)
+                category = self.env['sf.machine_tool.category'].search(
+                    [('code', '=', item['machine_tool_category']), ('active', '=', True)], limit=1)
 
                 if not machine_tool_type:
                     self.create({
@@ -1475,90 +1476,62 @@ class SyncFixtureModel(models.Model):
                 for item in result['fixture_model_yesterday_list']:
                     if item:
                         fixture_model = self.search([("code", '=', item['code']), ('active', 'in', [True, False])])
-                        zero_chuck_list = []
-                        for zero_chuck_id in item['zero_chuck_ids']:
-                            zero_chuck_list.append(
-                                self.env['sf.fixture.materials.basic.parameters']._json_zero_chuck_param(zero_chuck_id))
-                        zero_tray_list = []
-                        for zero_tray_id in item['zero_tray_ids']:
-                            zero_tray_list.append(
-                                self.env['sf.fixture.materials.basic.parameters']._json_zero_tray_param(zero_tray_id))
-                        pneumatic_fixture_list = []
-                        for pneumatic_fixture_id in item['pneumatic_fixture_ids']:
-                            pneumatic_fixture_list.append(
-                                self.env['sf.fixture.materials.basic.parameters']._json_pneumatic_fixture_param(
-                                    pneumatic_fixture_id))
-                        jaw_vice_fixture_list = []
-                        for jaw_vice_fixture_id in item['jaw_vice_fixture_ids']:
-                            jaw_vice_fixture_list.append(
-                                self.env['sf.fixture.materials.basic.parameters']._json_jaw_vice_fixture_param(
-                                    jaw_vice_fixture_id))
-                        magnet_fixture_list = []
-                        for magnet_fixture_id in item['magnet_fixture_ids']:
-                            magnet_fixture_list.append(
-                                self.env['sf.fixture.materials.basic.parameters']._json_magnet_fixture_param(
-                                    magnet_fixture_id))
-                        adapter_board_fixture_list = []
-                        for adapter_board_fixture_id in item['adapter_board_fixture_ids']:
-                            adapter_board_fixture_list.append(
-                                self.env['sf.fixture.materials.basic.parameters']._json_adapter_board_fixture_param(
-                                    adapter_board_fixture_id))
-                        scroll_chuck_list = []
-                        for scroll_chuck_id in item['scroll_chuck_ids']:
-                            scroll_chuck_list.append(
-                                self.env['sf.fixture.materials.basic.parameters']._json_scroll_chuck_param(
-                                    scroll_chuck_id))
+                        fixture_materials = self.env['sf.fixture.materials.basic.parameters']
+                        val = {
+                            "name": item['name'],
+                            "code": item['code'],
+                            "fixture_material_id": self.env['sf.fixture.material'].search(
+                                [('code', '=', item['fixture_material_code'])]).id,
+                            "multi_mounting_type_id": self.env['sf.multi_mounting.type'].search(
+                                [('code', '=', item['multi_mounting_type_code'])]).id,
+                            "brand_id": self.env['sf.machine.brand'].search([('code', '=', item['brand_code'])]).id,
+                            "model_file": '' if not item['model_file'] else base64.b64decode(item['model_file']),
+                            "status": item['status'],
+                            "active": item['active'],
+                        }
                         if not fixture_model:
-                            self.create({
-                                "name": item['name'],
-                                "code": item['code'],
-                                "fixture_material_id": self.env['sf.fixture.material'].search(
-                                    [('code', '=', item['fixture_material_code'])]).id,
-                                "multi_mounting_type_id": self.env['sf.multi_mounting.type'].search(
-                                    [('code', '=', item['multi_mounting_type_code'])]).id,
-                                "brand_id": self.env['sf.machine.brand'].search([('code', '=', item['brand_code'])]).id,
-                                "model_file": '' if not item['model_file'] else base64.b64decode(item['model_file']),
-                                "zero_chuck_ids": zero_chuck_list,
-                                "zero_tray_ids": zero_tray_list,
-                                "pneumatic_fixture_ids": pneumatic_fixture_list,
-                                "jaw_vice_fixture_ids": jaw_vice_fixture_list,
-                                "magnet_fixture_ids": magnet_fixture_list,
-                                "adapter_board_fixture_ids": adapter_board_fixture_list,
-                                "scroll_chuck_ids": scroll_chuck_list,
-                                "status": item['status'],
-                                "active": item['active'],
-                            })
+                            fixture_model = self.create(val)
+                            fixture_material_name = fixture_model.fixture_material_id.name
+                            if item['zero_chuck_ids'] and fixture_material_name == '零点卡盘':
+                                fixture_materials.create_fixture_materials(item['zero_chuck_ids'], fixture_model)
+                            elif item['zero_tray_ids'] and fixture_material_name == '零点托盘':
+                                fixture_materials.create_fixture_materials(item['zero_tray_ids'], fixture_model)
+                            elif item['pneumatic_fixture_ids'] and fixture_material_name == '气动夹具':
+                                fixture_materials.create_fixture_materials(item['pneumatic_fixture_ids'], fixture_model)
+                            elif item['jaw_vice_fixture_ids'] and fixture_material_name == '虎钳夹具':
+                                fixture_materials.create_fixture_materials(item['jaw_vice_fixture_ids'], fixture_model)
+                            elif item['magnet_fixture_ids'] and fixture_material_name == '磁吸夹具':
+                                fixture_materials.create_fixture_materials(item['magnet_fixture_ids'], fixture_model)
+                            elif item['adapter_board_fixture_ids'] and fixture_material_name == '转接板(锁板)夹具':
+                                fixture_materials.create_fixture_materials(item['adapter_board_fixture_ids'],
+                                                                           fixture_model)
+                            elif item['scroll_chuck_ids'] and fixture_material_name == '三爪卡盘':
+                                fixture_materials.create_fixture_materials(item['scroll_chuck_ids'], fixture_model)
                         else:
-                            fixture_model.write({
-                                "zero_chuck_ids": [(5, 0, 0)],
-                                "zero_tray_ids": [(5, 0, 0)],
-                                "pneumatic_fixture_ids": [(5, 0, 0)],
-                                "jaw_vice_fixture_ids": [(5, 0, 0)],
-                                "magnet_fixture_ids": [(5, 0, 0)],
-                                "adapter_board_fixture_ids": [(5, 0, 0)],
-                                "scroll_chuck_ids": [(5, 0, 0)],
-                            })
-                            self.env['sf.fixture.materials.basic.parameters'].sudo().search(
-                                [('fixture_model_id', '=', False)]).unlink()
-                            fixture_model.write({
-                                "name": item['name'],
-                                "code": item['code'],
-                                "fixture_material_id": self.env['sf.fixture.material'].search(
-                                    [('code', '=', item['fixture_material_code'])]).id,
-                                "multi_mounting_type_id": self.env['sf.multi_mounting.type'].search(
-                                    [('code', '=', item['multi_mounting_type_code'])]).id,
-                                "brand_id": self.env['sf.machine.brand'].search([('code', '=', item['brand_code'])]).id,
-                                "model_file": '' if not item['model_file'] else base64.b64decode(item['model_file']),
-                                "zero_chuck_ids": zero_chuck_list,
-                                "zero_tray_ids": zero_tray_list,
-                                "pneumatic_fixture_ids": pneumatic_fixture_list,
-                                "jaw_vice_fixture_ids": jaw_vice_fixture_list,
-                                "magnet_fixture_ids": magnet_fixture_list,
-                                "adapter_board_fixture_ids": adapter_board_fixture_list,
-                                "scroll_chuck_ids": scroll_chuck_list,
-                                "status": item['status'],
-                                "active": item['active'],
-                            })
+                            fixture_model.write(val)
+                            fixture_material_name = fixture_model.fixture_material_id.name
+                            if item['zero_chuck_ids'] and fixture_material_name == '零点卡盘':
+                                fixture_materials.write_fixture_materials(item['zero_chuck_ids'], fixture_material_name)
+                            elif item['zero_tray_ids'] and fixture_material_name == '零点托盘':
+                                fixture_materials.write_fixture_materials(item['zero_tray_ids'], fixture_material_name)
+                            elif item['pneumatic_fixture_ids'] and fixture_material_name == '气动夹具':
+                                fixture_materials.write_fixture_materials(item['pneumatic_fixture_ids'],
+                                                                          fixture_material_name)
+                            elif item['jaw_vice_fixture_ids'] and fixture_material_name == '虎钳夹具':
+                                fixture_materials.write_fixture_materials(item['jaw_vice_fixture_ids'],
+                                                                          fixture_material_name)
+                            elif item['magnet_fixture_ids'] and fixture_material_name == '磁吸夹具':
+                                fixture_materials.write_fixture_materials(item['magnet_fixture_ids'],
+                                                                          fixture_material_name)
+                            elif item['adapter_board_fixture_ids'] and fixture_material_name == '转接板(锁板)夹具':
+                                fixture_materials.write_fixture_materials(item['adapter_board_fixture_ids'],
+                                                                          fixture_material_name)
+                            elif item['scroll_chuck_ids'] and fixture_material_name == '三爪卡盘':
+                                fixture_materials.write_fixture_materials(item['scroll_chuck_ids'],
+                                                                          fixture_material_name)
+                            else:
+                                self.env['sf.fixture.materials.basic.parameters'].sudo().search(
+                                    [('fixture_model_id', '=', fixture_model.id)]).unlink()
         else:
             raise ValidationError("夹具型号认证未通过")
 
@@ -1576,90 +1549,62 @@ class SyncFixtureModel(models.Model):
                 for item in result['fixture_model_all_list']:
                     if item:
                         fixture_model = self.search([('code', '=', item['code']), ('active', 'in', [True, False])])
-                        zero_chuck_list = []
-                        for zero_chuck_id in item['zero_chuck_ids']:
-                            zero_chuck_list.append(
-                                self.env['sf.fixture.materials.basic.parameters']._json_zero_chuck_param(zero_chuck_id))
-                        zero_tray_list = []
-                        for zero_tray_id in item['zero_tray_ids']:
-                            zero_tray_list.append(
-                                self.env['sf.fixture.materials.basic.parameters']._json_zero_tray_param(zero_tray_id))
-                        pneumatic_fixture_list = []
-                        for pneumatic_fixture_id in item['pneumatic_fixture_ids']:
-                            pneumatic_fixture_list.append(
-                                self.env['sf.fixture.materials.basic.parameters']._json_pneumatic_fixture_param(
-                                    pneumatic_fixture_id))
-                        jaw_vice_fixture_list = []
-                        for jaw_vice_fixture_id in item['jaw_vice_fixture_ids']:
-                            jaw_vice_fixture_list.append(
-                                self.env['sf.fixture.materials.basic.parameters']._json_jaw_vice_fixture_param(
-                                    jaw_vice_fixture_id))
-                        magnet_fixture_list = []
-                        for magnet_fixture_id in item['magnet_fixture_ids']:
-                            magnet_fixture_list.append(
-                                self.env['sf.fixture.materials.basic.parameters']._json_magnet_fixture_param(
-                                    magnet_fixture_id))
-                        adapter_board_fixture_list = []
-                        for adapter_board_fixture_id in item['adapter_board_fixture_ids']:
-                            adapter_board_fixture_list.append(
-                                self.env['sf.fixture.materials.basic.parameters']._json_adapter_board_fixture_param(
-                                    adapter_board_fixture_id))
-                        scroll_chuck_list = []
-                        for scroll_chuck_id in item['scroll_chuck_ids']:
-                            scroll_chuck_list.append(
-                                self.env['sf.fixture.materials.basic.parameters']._json_scroll_chuck_param(
-                                    scroll_chuck_id))
+                        fixture_materials = self.env['sf.fixture.materials.basic.parameters']
+                        val = {
+                            "name": item['name'],
+                            "code": item['code'],
+                            "fixture_material_id": self.env['sf.fixture.material'].search(
+                                [('code', '=', item['fixture_material_code'])]).id,
+                            "multi_mounting_type_id": self.env['sf.multi_mounting.type'].search(
+                                [('code', '=', item['multi_mounting_type_code'])]).id,
+                            "brand_id": self.env['sf.machine.brand'].search([('code', '=', item['brand_code'])]).id,
+                            "model_file": '' if not item['model_file'] else base64.b64decode(item['model_file']),
+                            "status": item['status'],
+                            "active": item['active'],
+                        }
                         if not fixture_model:
-                            self.create({
-                                "name": item['name'],
-                                "code": item['code'],
-                                "fixture_material_id": self.env['sf.fixture.material'].search(
-                                    [('code', '=', item['fixture_material_code'])]).id,
-                                "multi_mounting_type_id": self.env['sf.multi_mounting.type'].search(
-                                    [('code', '=', item['multi_mounting_type_code'])]).id,
-                                "brand_id": self.env['sf.machine.brand'].search([('code', '=', item['brand_code'])]).id,
-                                "model_file": '' if not item['model_file'] else base64.b64decode(item['model_file']),
-                                "zero_chuck_ids": zero_chuck_list,
-                                "zero_tray_ids": zero_tray_list,
-                                "pneumatic_fixture_ids": pneumatic_fixture_list,
-                                "jaw_vice_fixture_ids": jaw_vice_fixture_list,
-                                "magnet_fixture_ids": magnet_fixture_list,
-                                "adapter_board_fixture_ids": adapter_board_fixture_list,
-                                "scroll_chuck_ids": scroll_chuck_list,
-                                "status": item['status'],
-                                "active": item['active'],
-                            })
+                            fixture_model = self.create(val)
+                            fixture_material_name = fixture_model.fixture_material_id.name
+                            if item['zero_chuck_ids'] and fixture_material_name == '零点卡盘':
+                                fixture_materials.create_fixture_materials(item['zero_chuck_ids'], fixture_model)
+                            elif item['zero_tray_ids'] and fixture_material_name == '零点托盘':
+                                fixture_materials.create_fixture_materials(item['zero_tray_ids'], fixture_model)
+                            elif item['pneumatic_fixture_ids'] and fixture_material_name == '气动夹具':
+                                fixture_materials.create_fixture_materials(item['pneumatic_fixture_ids'], fixture_model)
+                            elif item['jaw_vice_fixture_ids'] and fixture_material_name == '虎钳夹具':
+                                fixture_materials.create_fixture_materials(item['jaw_vice_fixture_ids'], fixture_model)
+                            elif item['magnet_fixture_ids'] and fixture_material_name == '磁吸夹具':
+                                fixture_materials.create_fixture_materials(item['magnet_fixture_ids'], fixture_model)
+                            elif item['adapter_board_fixture_ids'] and fixture_material_name == '转接板(锁板)夹具':
+                                fixture_materials.create_fixture_materials(item['adapter_board_fixture_ids'],
+                                                                           fixture_model)
+                            elif item['scroll_chuck_ids'] and fixture_material_name == '三爪卡盘':
+                                fixture_materials.create_fixture_materials(item['scroll_chuck_ids'], fixture_model)
                         else:
-                            fixture_model.write({
-                                "zero_chuck_ids": [(5, 0, 0)],
-                                "zero_tray_ids": [(5, 0, 0)],
-                                "pneumatic_fixture_ids": [(5, 0, 0)],
-                                "jaw_vice_fixture_ids": [(5, 0, 0)],
-                                "magnet_fixture_ids": [(5, 0, 0)],
-                                "adapter_board_fixture_ids": [(5, 0, 0)],
-                                "scroll_chuck_ids": [(5, 0, 0)],
-                            })
-                            self.env['sf.fixture.materials.basic.parameters'].sudo().search(
-                                [('fixture_model_id', '=', False)]).unlink()
-                            fixture_model.write({
-                                "name": item['name'],
-                                "code": item['code'],
-                                "fixture_material_id": self.env['sf.fixture.material'].search(
-                                    [('code', '=', item['fixture_material_code'])]).id,
-                                "multi_mounting_type_id": self.env['sf.multi_mounting.type'].search(
-                                    [('code', '=', item['multi_mounting_type_code'])]).id,
-                                "brand_id": self.env['sf.machine.brand'].search([('code', '=', item['brand_code'])]).id,
-                                "model_file": '' if not item['model_file'] else base64.b64decode(item['model_file']),
-                                "zero_chuck_ids": zero_chuck_list,
-                                "zero_tray_ids": zero_tray_list,
-                                "pneumatic_fixture_ids": pneumatic_fixture_list,
-                                "jaw_vice_fixture_ids": jaw_vice_fixture_list,
-                                "magnet_fixture_ids": magnet_fixture_list,
-                                "adapter_board_fixture_ids": adapter_board_fixture_list,
-                                "scroll_chuck_ids": scroll_chuck_list,
-                                "status": item['status'],
-                                "active": item['active'],
-                            })
+                            fixture_model.write(val)
+                            fixture_material_name = fixture_model.fixture_material_id.name
+                            if item['zero_chuck_ids'] and fixture_material_name == '零点卡盘':
+                                fixture_materials.write_fixture_materials(item['zero_chuck_ids'], fixture_material_name)
+                            elif item['zero_tray_ids'] and fixture_material_name == '零点托盘':
+                                fixture_materials.write_fixture_materials(item['zero_tray_ids'], fixture_material_name)
+                            elif item['pneumatic_fixture_ids'] and fixture_material_name == '气动夹具':
+                                fixture_materials.write_fixture_materials(item['pneumatic_fixture_ids'],
+                                                                          fixture_material_name)
+                            elif item['jaw_vice_fixture_ids'] and fixture_material_name == '虎钳夹具':
+                                fixture_materials.write_fixture_materials(item['jaw_vice_fixture_ids'],
+                                                                          fixture_material_name)
+                            elif item['magnet_fixture_ids'] and fixture_material_name == '磁吸夹具':
+                                fixture_materials.write_fixture_materials(item['magnet_fixture_ids'],
+                                                                          fixture_material_name)
+                            elif item['adapter_board_fixture_ids'] and fixture_material_name == '转接板(锁板)夹具':
+                                fixture_materials.write_fixture_materials(item['adapter_board_fixture_ids'],
+                                                                          fixture_material_name)
+                            elif item['scroll_chuck_ids'] and fixture_material_name == '三爪卡盘':
+                                fixture_materials.write_fixture_materials(item['scroll_chuck_ids'],
+                                                                          fixture_material_name)
+                            else:
+                                self.env['sf.fixture.materials.basic.parameters'].sudo().search(
+                                    [('fixture_model_id', '=', fixture_model.id)]).unlink()
         else:
             raise ValidationError("夹具型号认证未通过")
 
@@ -2457,8 +2402,9 @@ class CuttingToolBasicParameters(models.Model):
                                     'cutting_tool_type': '整体式刀具',
                                     'standard_library_id': self.env['sf.cutting_tool.standard.library'].search(
                                         [(
-                                         'code', '=', integral_tool_item['standard_library_code'].replace("JKM", result[
-                                             'factory_short_name']))]).id,
+                                            'code', '=',
+                                            integral_tool_item['standard_library_code'].replace("JKM", result[
+                                                'factory_short_name']))]).id,
                                     'total_length': integral_tool_item['total_length'],
                                     'blade_diameter': integral_tool_item['blade_diameter'],
                                     'blade_length': integral_tool_item['blade_length'],
@@ -2825,8 +2771,9 @@ class CuttingToolBasicParameters(models.Model):
                                     'cutting_tool_type': '整体式刀具',
                                     'standard_library_id': self.env['sf.cutting_tool.standard.library'].search(
                                         [(
-                                         'code', '=', integral_tool_item['standard_library_code'].replace("JKM", result[
-                                             'factory_short_name']))]).id,
+                                            'code', '=',
+                                            integral_tool_item['standard_library_code'].replace("JKM", result[
+                                                'factory_short_name']))]).id,
                                     'total_length': integral_tool_item['total_length'],
                                     'blade_diameter': integral_tool_item['blade_diameter'],
                                     'blade_length': integral_tool_item['blade_length'],
diff --git a/sf_tool_management/models/functional_tool_enroll.py b/sf_tool_management/models/functional_tool_enroll.py
index 0cfac5b7..1d954ed0 100644
--- a/sf_tool_management/models/functional_tool_enroll.py
+++ b/sf_tool_management/models/functional_tool_enroll.py
@@ -197,6 +197,12 @@ class FunctionalCuttingToolEntity(models.Model):
                 record.enroll_functional_tool_entity()
         return records
 
+    def write(self, vals):
+        res = super().write(vals)
+        if vals.get('current_location'):
+            self.enroll_functional_tool_entity()
+        return res
+
 
 class FunctionalToolWarning(models.Model):
     _inherit = 'sf.functional.tool.warning'

From 698ea31d312ae63b65bf8c0cf83a2f6c50ee14d9 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Mon, 18 Mar 2024 10:28:08 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=E5=A4=B9=E5=85=B7=E5=9E=8B=E5=8F=B7?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_base/models/basic_parameters_fixture.py | 82 +++++++++++++---------
 sf_base/models/fixture.py                  |  2 +-
 sf_base/views/fixture_view.xml             | 14 ++--
 sf_mrs_connect/models/sync_common.py       | 18 ++---
 4 files changed, 64 insertions(+), 52 deletions(-)

diff --git a/sf_base/models/basic_parameters_fixture.py b/sf_base/models/basic_parameters_fixture.py
index 362b5abf..1333d01f 100644
--- a/sf_base/models/basic_parameters_fixture.py
+++ b/sf_base/models/basic_parameters_fixture.py
@@ -93,52 +93,68 @@ class BasicParametersFixture(models.Model):
             for fixture_materials_data in fixture_materials_datas:
                 self.create(self._json_scroll_chuck_param(fixture_materials_data, fixture_model))
 
-    def write_fixture_materials(self, fixture_materials_datas, fixture_materials_name):
-        # 同步过来的cloud夹具物料的code
+    def write_fixture_materials(self, fixture_materials_datas, fixture_model):
+        fixture_materials_name = fixture_model.fixture_material_id.name
+        # cloud夹具物料的code
         mrs_fixture_materials_codes = []
         for fixture_materials_data in fixture_materials_datas:
             mrs_fixture_materials_codes.append(fixture_materials_data.get('code'))
+        # sf夹具物料的code 判断sf夹具型号关联的夹具物料在同步过来的mrs夹具物料中是否存在，不存在则删除
+        sf_materials_model_codes = self._get_sf_materials_model_codes(fixture_model)
+        for sf_materials_model_code in sf_materials_model_codes:
+            if sf_materials_model_code not in mrs_fixture_materials_codes:
+                self.search([('code', '=', sf_materials_model_code)]).sudo().unlink()
 
         for fixture_materials_data in fixture_materials_datas:
-            sf_materials_model_codes = []
-            # 判断sf夹具型号关联的夹具物料在同步过来的mrs夹具物料中是否存在，如果存在则修改，不存在则删除
-            data = self._get_fixture_materials_list(fixture_materials_data, fixture_materials_name)
-            for zero_chuck_id in data[1]:
-                code = zero_chuck_id.code
-                if code in mrs_fixture_materials_codes:
-                    self.search([('code', '=', code)]).sudo().write(data[0])
-                    sf_materials_model_codes.append(code)
-                else:
-                    self.search([('code', '=', code)]).sudo().unlink()
-            # 判断同步过来的mrs刀具物料在sf夹具型号关联的夹具物料中是否存在，如果不存在则创建
-            for mrs_fixture_materials_code in mrs_fixture_materials_codes:
-                if mrs_fixture_materials_code not in sf_materials_model_codes:
-                    self.sudo().create(data[0])
+            fixture_materials_list = self._get_fixture_materials_list(fixture_materials_data, fixture_materials_name,
+                                                                      fixture_model)
+            fixture_materials_code = fixture_materials_list.get('code')
+            # 判断同步过来的mrs刀具物料在sf夹具型号关联的夹具物料中是否存在，如果存在则修改，如果不存在则创建
+            if fixture_materials_code in sf_materials_model_codes:
+                self.search([('code', '=', fixture_materials_code)]).sudo().write(fixture_materials_list)
+            else:
+                self.sudo().create(fixture_materials_list)
 
-    def _get_fixture_materials_list(self, fixture_materials_data, fixture_materials_name):
-        fixture_model = self.env['sf.fixture.model'].sudo().search(
-            [('code', '=', fixture_materials_data['fixture_model_code']), ('active', '=', True)])
+    def _get_sf_materials_model_codes(self, fixture_model):
+        fixture_materials_name = fixture_model.fixture_material_id.name
         if fixture_materials_name == '零点卡盘':
-            materials_list = self._json_zero_chuck_param(fixture_materials_data, fixture_model)
-            return [materials_list, fixture_model.zero_chuck_ids]
+            return self._get_sf_materials_model_code(fixture_model.zero_chuck_ids)
         elif fixture_materials_name == '零点托盘':
-            materials_list = self._json_zero_tray_param(fixture_materials_data, fixture_model)
-            return [materials_list, fixture_model.zero_tray_ids]
+            return self._get_sf_materials_model_code(fixture_model.zero_tray_ids)
         elif fixture_materials_name == '气动夹具':
-            materials_list = self._json_pneumatic_fixture_param(fixture_materials_data, fixture_model)
-            return [materials_list, fixture_model.pneumatic_fixture_ids]
+            return self._get_sf_materials_model_code(fixture_model.pneumatic_fixture_ids)
         elif fixture_materials_name == '虎钳夹具':
-            materials_list = self._json_jaw_vice_fixture_param(fixture_materials_data, fixture_model)
-            return [materials_list, fixture_model.pneumatic_fixture_ids]
+            return self._get_sf_materials_model_code(fixture_model.pneumatic_fixture_ids)
         elif fixture_materials_name == '磁吸夹具':
-            materials_list = self._json_magnet_fixture_param(fixture_materials_data, fixture_model)
-            return [materials_list, fixture_model.magnet_fixture_ids]
+            return self._get_sf_materials_model_code(fixture_model.magnet_fixture_ids)
         elif fixture_materials_name == '转接板(锁板)夹具':
-            materials_list = self._json_adapter_board_fixture_param(fixture_materials_data, fixture_model)
-            return [materials_list, fixture_model.adapter_board_fixture_ids]
+            return self._get_sf_materials_model_code(fixture_model.adapter_board_fixture_ids)
         elif fixture_materials_name == '三爪卡盘':
-            materials_list = self._json_scroll_chuck_param(fixture_materials_data, fixture_model)
-            return [materials_list, fixture_model.scroll_chuck_ids]
+            return self._get_sf_materials_model_code(fixture_model.scroll_chuck_ids)
+        return False
+
+    def _get_sf_materials_model_code(self, fixture_materials_ids):
+        sf_materials_model_codes = []
+        for fixture_materials_id in fixture_materials_ids:
+            sf_materials_model_codes.append(fixture_materials_id.code)
+        return sf_materials_model_codes
+
+    def _get_fixture_materials_list(self, fixture_materials_data, fixture_materials_name, fixture_model):
+        if fixture_materials_name == '零点卡盘':
+            return self._json_zero_chuck_param(fixture_materials_data, fixture_model)
+        elif fixture_materials_name == '零点托盘':
+            return self._json_zero_tray_param(fixture_materials_data, fixture_model)
+        elif fixture_materials_name == '气动夹具':
+            return self._json_pneumatic_fixture_param(fixture_materials_data, fixture_model)
+        elif fixture_materials_name == '虎钳夹具':
+            return self._json_jaw_vice_fixture_param(fixture_materials_data, fixture_model)
+        elif fixture_materials_name == '磁吸夹具':
+            return self._json_magnet_fixture_param(fixture_materials_data, fixture_model)
+        elif fixture_materials_name == '转接板(锁板)夹具':
+            return self._json_adapter_board_fixture_param(fixture_materials_data, fixture_model)
+        elif fixture_materials_name == '三爪卡盘':
+            return self._json_scroll_chuck_param(fixture_materials_data, fixture_model)
+        return False
 
     def _json_zero_chuck_param(self, obj, fixture_model):
         """零点卡盘：将data数据转换成list数据"""
diff --git a/sf_base/models/fixture.py b/sf_base/models/fixture.py
index 0102b296..f64fe473 100644
--- a/sf_base/models/fixture.py
+++ b/sf_base/models/fixture.py
@@ -26,7 +26,7 @@ class FixtureModel(models.Model):
     _name = 'sf.fixture.model'
     _description = "夹具型号"
 
-    name = fields.Char(string="名称", size=50, required=True)
+    name = fields.Char(string="名称", size=50)
     fixture_material_id = fields.Many2one('sf.fixture.material', string="夹具物料")
     fixture_material_type = fields.Char(string="夹具物料类型", related='fixture_material_id.name')
     multi_mounting_type_id = fields.Many2one('sf.multi_mounting.type', string="联装类型")
diff --git a/sf_base/views/fixture_view.xml b/sf_base/views/fixture_view.xml
index fffa2a65..0e86738d 100644
--- a/sf_base/views/fixture_view.xml
+++ b/sf_base/views/fixture_view.xml
@@ -165,7 +165,7 @@
                             <field name="zero_chuck_ids"
                                    attrs="{'invisible': [('fixture_material_type', '!=', '零点卡盘')]}">
                                 <tree editable="bottom" class="center" delete="0">
-                                    <field name="code"/>
+                                    <field name="code" invisible="1"/>
                                     <field name="name"/>
                                     <field name="length"/>
                                     <field name="width"/>
@@ -191,7 +191,7 @@
                             <field name="zero_tray_ids"
                                    attrs="{'invisible': [('fixture_material_type', '!=', '零点托盘')]}">
                                 <tree editable="bottom" class="center" delete="0">
-                                    <field name="code"/>
+                                    <field name="code" invisible="1"/>
                                     <field name="name"/>
                                     <field name="length"/>
                                     <field name="width"/>
@@ -215,7 +215,7 @@
                             <field name="pneumatic_fixture_ids"
                                    attrs="{'invisible': [('fixture_material_type', '!=', '气动夹具')]}">
                                 <tree editable="bottom" class="center" delete="0">
-                                    <field name="code"/>
+                                    <field name="code" invisible="1"/>
                                     <field name="name"/>
                                     <field name="length"/>
                                     <field name="width"/>
@@ -243,7 +243,7 @@
                             <field name="jaw_vice_fixture_ids"
                                    attrs="{'invisible': [('fixture_material_type', '!=', '虎钳夹具')]}">
                                 <tree editable="bottom" class="center" delete="0">
-                                    <field name="code"/>
+                                    <field name="code" invisible="1"/>
                                     <field name="name"/>
                                     <field name="length"/>
                                     <field name="width"/>
@@ -272,7 +272,7 @@
                             <field name="magnet_fixture_ids"
                                    attrs="{'invisible': [('fixture_material_type', '!=', '磁吸夹具')]}">
                                 <tree editable="bottom" class="center" delete="0">
-                                    <field name="code"/>
+                                    <field name="code" invisible="1"/>
                                     <field name="name"/>
                                     <field name="length"/>
                                     <field name="width"/>
@@ -302,7 +302,7 @@
                             <field name="adapter_board_fixture_ids"
                                    attrs="{'invisible': [('fixture_material_type', '!=', '转接板(锁板)夹具')]}">
                                 <tree editable="bottom" class="center" delete="0">
-                                    <field name="code"/>
+                                    <field name="code" invisible="1"/>
                                     <field name="name"/>
                                     <field name="length"/>
                                     <field name="width"/>
@@ -329,7 +329,7 @@
                             <field name="scroll_chuck_ids"
                                    attrs="{'invisible': [('fixture_material_type', '!=', '三爪卡盘')]}">
                                 <tree editable="bottom" class="center" delete="0">
-                                    <field name="code"/>
+                                    <field name="code" invisible="1"/>
                                     <field name="name"/>
                                     <field name="length"/>
                                     <field name="width"/>
diff --git a/sf_mrs_connect/models/sync_common.py b/sf_mrs_connect/models/sync_common.py
index 06f73e53..210194db 100644
--- a/sf_mrs_connect/models/sync_common.py
+++ b/sf_mrs_connect/models/sync_common.py
@@ -1584,24 +1584,20 @@ class SyncFixtureModel(models.Model):
                             fixture_model.write(val)
                             fixture_material_name = fixture_model.fixture_material_id.name
                             if item['zero_chuck_ids'] and fixture_material_name == '零点卡盘':
-                                fixture_materials.write_fixture_materials(item['zero_chuck_ids'], fixture_material_name)
+                                fixture_materials.write_fixture_materials(item['zero_chuck_ids'], fixture_model)
                             elif item['zero_tray_ids'] and fixture_material_name == '零点托盘':
-                                fixture_materials.write_fixture_materials(item['zero_tray_ids'], fixture_material_name)
+                                fixture_materials.write_fixture_materials(item['zero_tray_ids'], fixture_model)
                             elif item['pneumatic_fixture_ids'] and fixture_material_name == '气动夹具':
-                                fixture_materials.write_fixture_materials(item['pneumatic_fixture_ids'],
-                                                                          fixture_material_name)
+                                fixture_materials.write_fixture_materials(item['pneumatic_fixture_ids'], fixture_model)
                             elif item['jaw_vice_fixture_ids'] and fixture_material_name == '虎钳夹具':
-                                fixture_materials.write_fixture_materials(item['jaw_vice_fixture_ids'],
-                                                                          fixture_material_name)
+                                fixture_materials.write_fixture_materials(item['jaw_vice_fixture_ids'], fixture_model)
                             elif item['magnet_fixture_ids'] and fixture_material_name == '磁吸夹具':
-                                fixture_materials.write_fixture_materials(item['magnet_fixture_ids'],
-                                                                          fixture_material_name)
+                                fixture_materials.write_fixture_materials(item['magnet_fixture_ids'], fixture_model)
                             elif item['adapter_board_fixture_ids'] and fixture_material_name == '转接板(锁板)夹具':
                                 fixture_materials.write_fixture_materials(item['adapter_board_fixture_ids'],
-                                                                          fixture_material_name)
+                                                                          fixture_model)
                             elif item['scroll_chuck_ids'] and fixture_material_name == '三爪卡盘':
-                                fixture_materials.write_fixture_materials(item['scroll_chuck_ids'],
-                                                                          fixture_material_name)
+                                fixture_materials.write_fixture_materials(item['scroll_chuck_ids'], fixture_model)
                             else:
                                 self.env['sf.fixture.materials.basic.parameters'].sudo().search(
                                     [('fixture_model_id', '=', fixture_model.id)]).unlink()

From e444e27cad712e5b619124a6c3daf2b308e3dadd Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Mon, 18 Mar 2024 14:42:51 +0800
Subject: [PATCH 3/9] =?UTF-8?q?1.=E9=80=89=E6=8B=A9=E8=A7=84=E5=88=99?=
 =?UTF-8?q?=EF=BC=8C=E5=B8=A6=E5=87=BA=E5=AF=B9=E5=BA=94=E5=9E=8B=E5=8F=B7?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=202.=E8=A7=84=E6=A0=BC=E5=BC=B9=E5=87=BA?=
 =?UTF-8?q?=E7=9A=84=E9=A1=B5=E9=9D=A2=E9=9A=90=E8=97=8F=E5=88=80=E5=85=B7?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=203.=E5=9E=8B=E5=8F=B7=E6=96=B0=E5=BB=BA?=
 =?UTF-8?q?=E5=BC=B9=E5=87=BA=E7=9A=84=E9=A1=B5=E9=9D=A2=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=8E=BB=E6=8E=89option=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=EF=BC=8C=E7=BC=96=E7=A0=81=E6=94=B9=E4=B8=BA=E5=BC=BA=E5=88=B6?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_base/views/tool_basic_param.xml | 2 +-
 sf_base/views/tool_views.xml       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sf_base/views/tool_basic_param.xml b/sf_base/views/tool_basic_param.xml
index 57a4a9a4..d138eeb8 100644
--- a/sf_base/views/tool_basic_param.xml
+++ b/sf_base/views/tool_basic_param.xml
@@ -124,7 +124,7 @@
             <field name="arch" type="xml">
                 <form string="规则">
                     <sheet>
-                        <field name="cutting_tool_type" invisible="0"/>
+                        <field name="cutting_tool_type" invisible="1"/>
                         <field name="standard_library_id" invisible="1"/>
                         <group>
                             <group attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}">
diff --git a/sf_base/views/tool_views.xml b/sf_base/views/tool_views.xml
index aa0e01da..34b87a41 100644
--- a/sf_base/views/tool_views.xml
+++ b/sf_base/views/tool_views.xml
@@ -123,10 +123,10 @@
                 <form string="刀具标准库" delete="0" create="0" edit="0">
                     <sheet>
                         <field name="image" widget='image' class="oe_avatar"
-                               options="{'zoom': true, 'preview_image':'image_128'}" required="1"/>
+                                required="1"/>
                         <div class="oe_title">
                             <h1>
-                                <field name="code" readonly="1"/>
+                                <field name="code" readonly="1" force_save="1"/>
                             </h1>
                         </div>
                         <group>

From cfd2910eadcaf775dc048123f0db0556f45ee1d8 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Mon, 18 Mar 2024 14:43:27 +0800
Subject: [PATCH 4/9] Merge branch 'develop' of
 https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop

---
 sf_base/models/basic_parameters_fixture.py    | 443 +++++++++++-------
 sf_base/models/fixture.py                     |   6 +-
 sf_base/views/fixture_view.xml                |   7 +
 sf_mrs_connect/models/sync_common.py          | 281 +++++------
 sf_plan/models/custom_plan.py                 |  12 +-
 sf_plan/views/view.xml                        |   2 +-
 .../models/functional_tool_enroll.py          |   6 +
 sf_warehouse/models/model.py                  |   8 +
 8 files changed, 411 insertions(+), 354 deletions(-)

diff --git a/sf_base/models/basic_parameters_fixture.py b/sf_base/models/basic_parameters_fixture.py
index 7bd69a35..1333d01f 100644
--- a/sf_base/models/basic_parameters_fixture.py
+++ b/sf_base/models/basic_parameters_fixture.py
@@ -67,186 +67,275 @@ class BasicParametersFixture(models.Model):
     mounting_hole_depth = fields.Float('安装孔深度(mm)', digits=(16, 2))
     centering_diameter = fields.Float('定心直径(mm)', digits=(16, 2))
 
-    def _json_zero_chuck_param(self, obj):
-        zero_chuck_param_str = (0, '', {
-            'name': obj['name'],
-            'length': obj['length'],
-            'width': obj['width'],
-            'height': obj['height'],
-            'diameter': obj['diameter'],
-            'weight': obj['weight'],
-            'orientation_dish_diameter': obj['orientation_dish_diameter'],
-            'clamping_diameter': obj['clamping_diameter'],
-            'clamping_num': obj['clamping_num'],
-            'chucking_power_max': obj['chucking_power_max'],
-            'repeated_positioning_accuracy': obj['repeated_positioning_accuracy'],
-            'boolean_transposing_hole': obj['boolean_transposing_hole'],
-            'unlocking_method': obj['unlocking_method'],
-            'boolean_chip_blowing_function': obj['boolean_chip_blowing_function'],
-            'carrying_capacity_max': obj['carrying_capacity_max'],
-            'rigidity': obj['rigidity'],
-            'materials_model_id': self.env['sf.materials.model'].sudo().search(
-                [('materials_no', '=', obj['materials_model_id']), ('active', '=', True)]).id,
-            'machine_tool_type_id': self.env['sf.machine_tool.type'].sudo().search(
-                [('code', '=', obj['machine_tool_type_id']), ('active', '=', True)]).id,
-        })
-        return zero_chuck_param_str
+    code = fields.Char('编码')
 
-    def _json_zero_tray_param(self, obj):
-        zero_tray_param_str = (0, '', {
-            'name': obj['name'],
-            'length': obj['length'],
-            'width': obj['width'],
-            'height': obj['height'],
-            'diameter': obj['diameter'],
-            'weight': obj['weight'],
-            'clamping_diameter': obj['clamping_diameter'],
-            'connector_diameter': obj['connector_diameter'],
-            'chucking_power_max': obj['chucking_power_max'],
-            'repeated_positioning_accuracy': obj['repeated_positioning_accuracy'],
-            'boolean_chip_blowing_function': obj['boolean_chip_blowing_function'],
-            'way_to_install': obj['way_to_install'],
-            'type_of_drive': obj['type_of_drive'],
-            'carrying_capacity_max': obj['carrying_capacity_max'],
-            'materials_model_id': self.env['sf.materials.model'].sudo().search(
-                [('materials_no', '=', obj['materials_model_id']), ('active', '=', True)]).id,
-            'rigidity': obj['rigidity'],
-        })
-        return zero_tray_param_str
+    def create_fixture_materials(self, fixture_materials_datas, fixture_model):
+        fixture_materials_name = fixture_model.fixture_material_id.name
+        if fixture_materials_name == '零点卡盘':
+            for fixture_materials_data in fixture_materials_datas:
+                self.create(self._json_zero_chuck_param(fixture_materials_data, fixture_model))
+        elif fixture_materials_name == '零点托盘':
+            for fixture_materials_data in fixture_materials_datas:
+                self.create(self._json_zero_tray_param(fixture_materials_data, fixture_model))
+        elif fixture_materials_name == '气动夹具':
+            for fixture_materials_data in fixture_materials_datas:
+                self.create(self._json_pneumatic_fixture_param(fixture_materials_data, fixture_model))
+        elif fixture_materials_name == '虎钳夹具':
+            for fixture_materials_data in fixture_materials_datas:
+                self.create(self._json_jaw_vice_fixture_param(fixture_materials_data, fixture_model))
+        elif fixture_materials_name == '磁吸夹具':
+            for fixture_materials_data in fixture_materials_datas:
+                self.create(self._json_magnet_fixture_param(fixture_materials_data, fixture_model))
+        elif fixture_materials_name == '转接板(锁板)夹具':
+            for fixture_materials_data in fixture_materials_datas:
+                self.create(self._json_adapter_board_fixture_param(fixture_materials_data, fixture_model))
+        elif fixture_materials_name == '三爪卡盘':
+            for fixture_materials_data in fixture_materials_datas:
+                self.create(self._json_scroll_chuck_param(fixture_materials_data, fixture_model))
 
-    def _json_pneumatic_fixture_param(self, obj):
-        pneumatic_fixture_param_str = (0, '', {
-            'name': obj['name'],
-            'length': obj['length'],
-            'width': obj['width'],
-            'height': obj['height'],
-            'weight': obj['weight'],
-            'gripper_length_min': obj['gripper_length_min'],
-            'gripper_width_min': obj['gripper_width_min'],
-            'gripper_height_min': obj['gripper_height_min'],
-            'gripper_diameter_min': obj['gripper_diameter_min'],
-            'gripper_length_max': obj['gripper_length_max'],
-            'gripper_width_max': obj['gripper_width_max'],
-            'gripper_height_max': obj['gripper_height_max'],
-            'gripper_diameter_max': obj['gripper_diameter_max'],
-            'chucking_power_max': obj['chucking_power_max'],
-            'carrying_capacity_max': obj['carrying_capacity_max'],
-            'rated_air_pressure': obj['rated_air_pressure'],
-            'materials_model_id': self.env['sf.materials.model'].sudo().search(
-                [('materials_no', '=', obj['materials_model_id']), ('active', '=', True)]).id,
-            'rigidity': obj['rigidity'],
-            'interface_materials_model_id': self.env['sf.materials.model'].sudo().search(
-                [('materials_no', '=', obj['materials_model_id']), ('active', '=', True)]).id,
-            'type_of_drive': obj['type_of_drive'],
-        })
-        return pneumatic_fixture_param_str
+    def write_fixture_materials(self, fixture_materials_datas, fixture_model):
+        fixture_materials_name = fixture_model.fixture_material_id.name
+        # cloud夹具物料的code
+        mrs_fixture_materials_codes = []
+        for fixture_materials_data in fixture_materials_datas:
+            mrs_fixture_materials_codes.append(fixture_materials_data.get('code'))
+        # sf夹具物料的code 判断sf夹具型号关联的夹具物料在同步过来的mrs夹具物料中是否存在，不存在则删除
+        sf_materials_model_codes = self._get_sf_materials_model_codes(fixture_model)
+        for sf_materials_model_code in sf_materials_model_codes:
+            if sf_materials_model_code not in mrs_fixture_materials_codes:
+                self.search([('code', '=', sf_materials_model_code)]).sudo().unlink()
 
-    def _json_jaw_vice_fixture_param(self, obj):
-        jaw_vice_fixture_param_str = (0, '', {
-            'name': obj['name'],
-            'length': obj['length'],
-            'width': obj['width'],
-            'height': obj['height'],
-            'weight': obj['weight'],
-            'gripper_length_min': obj['gripper_length_min'],
-            'gripper_width_min': obj['gripper_width_min'],
-            'gripper_height_min': obj['gripper_height_min'],
-            'gripper_diameter_min': obj['gripper_diameter_min'],
-            'gripper_length_max': obj['gripper_length_max'],
-            'gripper_width_max': obj['gripper_width_max'],
-            'gripper_height_max': obj['gripper_height_max'],
-            'gripper_diameter_max': obj['gripper_diameter_max'],
-            'chucking_power_max': obj['chucking_power_max'],
-            'carrying_capacity_max': obj['carrying_capacity_max'],
-            'transverse_groove': obj['transverse_groove'],
-            'longitudinal_fitting_groove': obj['longitudinal_fitting_groove'],
-            'materials_model_id': self.env['sf.materials.model'].sudo().search(
-                [('materials_no', '=', obj['materials_model_id']), ('active', '=', True)]).id,
-            'rigidity': obj['rigidity'],
-            'interface_materials_model_id': self.env['sf.materials.model'].sudo().search(
-                [('materials_no', '=', obj['materials_model_id']), ('active', '=', True)]).id,
-            'type_of_drive': obj['type_of_drive'],
-        })
-        return jaw_vice_fixture_param_str
+        for fixture_materials_data in fixture_materials_datas:
+            fixture_materials_list = self._get_fixture_materials_list(fixture_materials_data, fixture_materials_name,
+                                                                      fixture_model)
+            fixture_materials_code = fixture_materials_list.get('code')
+            # 判断同步过来的mrs刀具物料在sf夹具型号关联的夹具物料中是否存在，如果存在则修改，如果不存在则创建
+            if fixture_materials_code in sf_materials_model_codes:
+                self.search([('code', '=', fixture_materials_code)]).sudo().write(fixture_materials_list)
+            else:
+                self.sudo().create(fixture_materials_list)
 
-    def _json_magnet_fixture_param(self, obj):
-        magnet_fixture_param_str = (0, '', {
-            'name': obj['name'],
-            'length': obj['length'],
-            'width': obj['width'],
-            'height': obj['height'],
-            'height_tolerance_value': obj['height_tolerance_value'],
-            'weight': obj['weight'],
-            'gripper_length_min': obj['gripper_length_min'],
-            'gripper_width_min': obj['gripper_width_min'],
-            'gripper_height_min': obj['gripper_height_min'],
-            'gripper_diameter_min': obj['gripper_diameter_min'],
-            'gripper_length_max': obj['gripper_length_max'],
-            'gripper_width_max': obj['gripper_width_max'],
-            'gripper_height_max': obj['gripper_height_max'],
-            'gripper_diameter_max': obj['gripper_diameter_max'],
-            'rated_adsorption_force': obj['rated_adsorption_force'],
-            'magnetic_field_height': obj['magnetic_field_height'],
-            'magnetic_pole_plate_grinding_allowance': obj['magnetic_pole_plate_grinding_allowance'],
-            'carrying_capacity_max': obj['carrying_capacity_max'],
-            'materials_model_id': self.env['sf.materials.model'].sudo().search(
-                [('materials_no', '=', obj['materials_model_id']), ('active', '=', True)]).id,
-            'rigidity': obj['rigidity'],
-            'interface_materials_model_id': self.env['sf.materials.model'].sudo().search(
-                [('materials_no', '=', obj['materials_model_id']), ('active', '=', True)]).id,
-            'type_of_drive': obj['type_of_drive'],
-        })
-        return magnet_fixture_param_str
+    def _get_sf_materials_model_codes(self, fixture_model):
+        fixture_materials_name = fixture_model.fixture_material_id.name
+        if fixture_materials_name == '零点卡盘':
+            return self._get_sf_materials_model_code(fixture_model.zero_chuck_ids)
+        elif fixture_materials_name == '零点托盘':
+            return self._get_sf_materials_model_code(fixture_model.zero_tray_ids)
+        elif fixture_materials_name == '气动夹具':
+            return self._get_sf_materials_model_code(fixture_model.pneumatic_fixture_ids)
+        elif fixture_materials_name == '虎钳夹具':
+            return self._get_sf_materials_model_code(fixture_model.pneumatic_fixture_ids)
+        elif fixture_materials_name == '磁吸夹具':
+            return self._get_sf_materials_model_code(fixture_model.magnet_fixture_ids)
+        elif fixture_materials_name == '转接板(锁板)夹具':
+            return self._get_sf_materials_model_code(fixture_model.adapter_board_fixture_ids)
+        elif fixture_materials_name == '三爪卡盘':
+            return self._get_sf_materials_model_code(fixture_model.scroll_chuck_ids)
+        return False
 
-    def _json_adapter_board_fixture_param(self, obj):
-        adapter_board_fixture_param_str = (0, '', {
-            'name': obj['name'],
-            'length': obj['length'],
-            'width': obj['width'],
-            'height': obj['height'],
-            'weight': obj['weight'],
-            'gripper_length_min': obj['gripper_length_min'],
-            'gripper_width_min': obj['gripper_width_min'],
-            'gripper_height_min': obj['gripper_height_min'],
-            'gripper_diameter_min': obj['gripper_diameter_min'],
-            'gripper_length_max': obj['gripper_length_max'],
-            'gripper_width_max': obj['gripper_width_max'],
-            'gripper_height_max': obj['gripper_height_max'],
-            'gripper_diameter_max': obj['gripper_diameter_max'],
-            'chucking_power_max': obj['chucking_power_max'],
-            'carrying_capacity_max': obj['carrying_capacity_max'],
-            'materials_model_id': self.env['sf.materials.model'].sudo().search(
-                [('materials_no', '=', obj['materials_model_id']), ('active', '=', True)]).id,
-            'rigidity': obj['rigidity'],
-            'screw_size': obj['screw_size'],
-            'via_hole_diameter': obj['via_hole_diameter'],
-            'type_of_drive': obj['type_of_drive'],
-        })
-        return adapter_board_fixture_param_str
+    def _get_sf_materials_model_code(self, fixture_materials_ids):
+        sf_materials_model_codes = []
+        for fixture_materials_id in fixture_materials_ids:
+            sf_materials_model_codes.append(fixture_materials_id.code)
+        return sf_materials_model_codes
 
-    def _json_scroll_chuck_param(self, obj):
-        scroll_chuck_param_str = (0, '', {
-            'name': obj['name'],
-            'length': obj['length'],
-            'width': obj['width'],
-            'height': obj['height'],
-            'diameter': obj['diameter'],
-            'weight': obj['weight'],
-            'gripper_length_min': obj['gripper_length_min'],
-            'gripper_width_min': obj['gripper_width_min'],
-            'gripper_height_min': obj['gripper_height_min'],
-            'gripper_diameter_min': obj['gripper_diameter_min'],
-            'gripper_length_max': obj['gripper_length_max'],
-            'gripper_width_max': obj['gripper_width_max'],
-            'gripper_height_max': obj['gripper_height_max'],
-            'gripper_diameter_max': obj['gripper_diameter_max'],
-            'chucking_power_max': obj['chucking_power_max'],
-            'carrying_capacity_max': obj['carrying_capacity_max'],
-            'materials_model_id': self.env['sf.materials.model'].sudo().search(
-                [('materials_no', '=', obj['materials_model_id']), ('active', '=', True)]).id,
-            'rigidity': obj['rigidity'],
-            'mounting_hole_depth': obj['mounting_hole_depth'],
-            'centering_diameter': obj['centering_diameter'],
-            'type_of_drive': obj['type_of_drive'],
-        })
-        return scroll_chuck_param_str
+    def _get_fixture_materials_list(self, fixture_materials_data, fixture_materials_name, fixture_model):
+        if fixture_materials_name == '零点卡盘':
+            return self._json_zero_chuck_param(fixture_materials_data, fixture_model)
+        elif fixture_materials_name == '零点托盘':
+            return self._json_zero_tray_param(fixture_materials_data, fixture_model)
+        elif fixture_materials_name == '气动夹具':
+            return self._json_pneumatic_fixture_param(fixture_materials_data, fixture_model)
+        elif fixture_materials_name == '虎钳夹具':
+            return self._json_jaw_vice_fixture_param(fixture_materials_data, fixture_model)
+        elif fixture_materials_name == '磁吸夹具':
+            return self._json_magnet_fixture_param(fixture_materials_data, fixture_model)
+        elif fixture_materials_name == '转接板(锁板)夹具':
+            return self._json_adapter_board_fixture_param(fixture_materials_data, fixture_model)
+        elif fixture_materials_name == '三爪卡盘':
+            return self._json_scroll_chuck_param(fixture_materials_data, fixture_model)
+        return False
+
+    def _json_zero_chuck_param(self, obj, fixture_model):
+        """零点卡盘：将data数据转换成list数据"""
+        return {'code': obj['code'],
+                'fixture_model_id': fixture_model.id,
+                'name': obj['name'],
+                'length': obj['length'],
+                'width': obj['width'],
+                'height': obj['height'],
+                'diameter': obj['diameter'],
+                'weight': obj['weight'],
+                'orientation_dish_diameter': obj['orientation_dish_diameter'],
+                'clamping_diameter': obj['clamping_diameter'],
+                'clamping_num': obj['clamping_num'],
+                'chucking_power_max': obj['chucking_power_max'],
+                'repeated_positioning_accuracy': obj['repeated_positioning_accuracy'],
+                'boolean_transposing_hole': obj['boolean_transposing_hole'],
+                'unlocking_method': obj['unlocking_method'],
+                'boolean_chip_blowing_function': obj['boolean_chip_blowing_function'],
+                'carrying_capacity_max': obj['carrying_capacity_max'],
+                'rigidity': obj['rigidity'],
+                'materials_model_id': self.env['sf.materials.model'].sudo().search(
+                    [('materials_no', '=', obj['materials_model_id']), ('active', '=', True)]).id,
+                'machine_tool_type_id': self.env['sf.machine_tool.type'].sudo().search(
+                    [('code', '=', obj['machine_tool_type_id']), ('active', '=', True)]).id}
+
+    def _json_zero_tray_param(self, obj, fixture_model):
+        """零点托盘：将data数据转换成list数据"""
+        return {'code': obj['code'],
+                'fixture_model_id': fixture_model.id,
+                'name': obj['name'],
+                'length': obj['length'],
+                'width': obj['width'],
+                'height': obj['height'],
+                'diameter': obj['diameter'],
+                'weight': obj['weight'],
+                'clamping_diameter': obj['clamping_diameter'],
+                'connector_diameter': obj['connector_diameter'],
+                'chucking_power_max': obj['chucking_power_max'],
+                'repeated_positioning_accuracy': obj['repeated_positioning_accuracy'],
+                'boolean_chip_blowing_function': obj['boolean_chip_blowing_function'],
+                'way_to_install': obj['way_to_install'],
+                'type_of_drive': obj['type_of_drive'],
+                'carrying_capacity_max': obj['carrying_capacity_max'],
+                'materials_model_id': self.env['sf.materials.model'].sudo().search(
+                    [('materials_no', '=', obj['materials_model_id']), ('active', '=', True)]).id,
+                'rigidity': obj['rigidity']}
+
+    def _json_pneumatic_fixture_param(self, obj, fixture_model):
+        """气动夹具：将data数据转换成list数据"""
+        return {'code': obj['code'],
+                'fixture_model_id': fixture_model.id,
+                'name': obj['name'],
+                'length': obj['length'],
+                'width': obj['width'],
+                'height': obj['height'],
+                'weight': obj['weight'],
+                'gripper_length_min': obj['gripper_length_min'],
+                'gripper_width_min': obj['gripper_width_min'],
+                'gripper_height_min': obj['gripper_height_min'],
+                'gripper_diameter_min': obj['gripper_diameter_min'],
+                'gripper_length_max': obj['gripper_length_max'],
+                'gripper_width_max': obj['gripper_width_max'],
+                'gripper_height_max': obj['gripper_height_max'],
+                'gripper_diameter_max': obj['gripper_diameter_max'],
+                'chucking_power_max': obj['chucking_power_max'],
+                'carrying_capacity_max': obj['carrying_capacity_max'],
+                'rated_air_pressure': obj['rated_air_pressure'],
+                'materials_model_id': self.env['sf.materials.model'].sudo().search(
+                    [('materials_no', '=', obj['materials_model_id']), ('active', '=', True)]).id,
+                'rigidity': obj['rigidity'],
+                'interface_materials_model_id': self.env['sf.materials.model'].sudo().search(
+                    [('materials_no', '=', obj['materials_model_id']), ('active', '=', True)]).id,
+                'type_of_drive': obj['type_of_drive']}
+
+    def _json_jaw_vice_fixture_param(self, obj, fixture_model):
+        """虎钳夹具：将data数据转换成list数据"""
+        return {'code': obj['code'],
+                'fixture_model_id': fixture_model.id,
+                'name': obj['name'],
+                'length': obj['length'],
+                'width': obj['width'],
+                'height': obj['height'],
+                'weight': obj['weight'],
+                'gripper_length_min': obj['gripper_length_min'],
+                'gripper_width_min': obj['gripper_width_min'],
+                'gripper_height_min': obj['gripper_height_min'],
+                'gripper_diameter_min': obj['gripper_diameter_min'],
+                'gripper_length_max': obj['gripper_length_max'],
+                'gripper_width_max': obj['gripper_width_max'],
+                'gripper_height_max': obj['gripper_height_max'],
+                'gripper_diameter_max': obj['gripper_diameter_max'],
+                'chucking_power_max': obj['chucking_power_max'],
+                'carrying_capacity_max': obj['carrying_capacity_max'],
+                'transverse_groove': obj['transverse_groove'],
+                'longitudinal_fitting_groove': obj['longitudinal_fitting_groove'],
+                'materials_model_id': self.env['sf.materials.model'].sudo().search(
+                    [('materials_no', '=', obj['materials_model_id']), ('active', '=', True)]).id,
+                'rigidity': obj['rigidity'],
+                'interface_materials_model_id': self.env['sf.materials.model'].sudo().search(
+                    [('materials_no', '=', obj['materials_model_id']), ('active', '=', True)]).id,
+                'type_of_drive': obj['type_of_drive']}
+
+    def _json_magnet_fixture_param(self, obj, fixture_model):
+        """磁吸夹具：将data数据转换成list数据"""
+        return {'code': obj['code'],
+                'fixture_model_id': fixture_model.id,
+                'name': obj['name'],
+                'length': obj['length'],
+                'width': obj['width'],
+                'height': obj['height'],
+                'height_tolerance_value': obj['height_tolerance_value'],
+                'weight': obj['weight'],
+                'gripper_length_min': obj['gripper_length_min'],
+                'gripper_width_min': obj['gripper_width_min'],
+                'gripper_height_min': obj['gripper_height_min'],
+                'gripper_diameter_min': obj['gripper_diameter_min'],
+                'gripper_length_max': obj['gripper_length_max'],
+                'gripper_width_max': obj['gripper_width_max'],
+                'gripper_height_max': obj['gripper_height_max'],
+                'gripper_diameter_max': obj['gripper_diameter_max'],
+                'rated_adsorption_force': obj['rated_adsorption_force'],
+                'magnetic_field_height': obj['magnetic_field_height'],
+                'magnetic_pole_plate_grinding_allowance': obj['magnetic_pole_plate_grinding_allowance'],
+                'carrying_capacity_max': obj['carrying_capacity_max'],
+                'materials_model_id': self.env['sf.materials.model'].sudo().search(
+                    [('materials_no', '=', obj['materials_model_id']), ('active', '=', True)]).id,
+                'rigidity': obj['rigidity'],
+                'interface_materials_model_id': self.env['sf.materials.model'].sudo().search(
+                    [('materials_no', '=', obj['materials_model_id']), ('active', '=', True)]).id,
+                'type_of_drive': obj['type_of_drive']}
+
+    def _json_adapter_board_fixture_param(self, obj, fixture_model):
+        """转接板(锁板)夹具：将data数据转换成list数据"""
+        return {'code': obj['code'],
+                'fixture_model_id': fixture_model.id,
+                'name': obj['name'],
+                'length': obj['length'],
+                'width': obj['width'],
+                'height': obj['height'],
+                'weight': obj['weight'],
+                'gripper_length_min': obj['gripper_length_min'],
+                'gripper_width_min': obj['gripper_width_min'],
+                'gripper_height_min': obj['gripper_height_min'],
+                'gripper_diameter_min': obj['gripper_diameter_min'],
+                'gripper_length_max': obj['gripper_length_max'],
+                'gripper_width_max': obj['gripper_width_max'],
+                'gripper_height_max': obj['gripper_height_max'],
+                'gripper_diameter_max': obj['gripper_diameter_max'],
+                'chucking_power_max': obj['chucking_power_max'],
+                'carrying_capacity_max': obj['carrying_capacity_max'],
+                'materials_model_id': self.env['sf.materials.model'].sudo().search(
+                    [('materials_no', '=', obj['materials_model_id']), ('active', '=', True)]).id,
+                'rigidity': obj['rigidity'],
+                'screw_size': obj['screw_size'],
+                'via_hole_diameter': obj['via_hole_diameter'],
+                'type_of_drive': obj['type_of_drive']}
+
+    def _json_scroll_chuck_param(self, obj, fixture_model):
+        """转接板(锁板)夹具：将data数据转换成list数据"""
+        return {'code': obj['code'],
+                'fixture_model_id': fixture_model.id,
+                'name': obj['name'],
+                'length': obj['length'],
+                'width': obj['width'],
+                'height': obj['height'],
+                'diameter': obj['diameter'],
+                'weight': obj['weight'],
+                'gripper_length_min': obj['gripper_length_min'],
+                'gripper_width_min': obj['gripper_width_min'],
+                'gripper_height_min': obj['gripper_height_min'],
+                'gripper_diameter_min': obj['gripper_diameter_min'],
+                'gripper_length_max': obj['gripper_length_max'],
+                'gripper_width_max': obj['gripper_width_max'],
+                'gripper_height_max': obj['gripper_height_max'],
+                'gripper_diameter_max': obj['gripper_diameter_max'],
+                'chucking_power_max': obj['chucking_power_max'],
+                'carrying_capacity_max': obj['carrying_capacity_max'],
+                'materials_model_id': self.env['sf.materials.model'].sudo().search(
+                    [('materials_no', '=', obj['materials_model_id']), ('active', '=', True)]).id,
+                'rigidity': obj['rigidity'],
+                'mounting_hole_depth': obj['mounting_hole_depth'],
+                'centering_diameter': obj['centering_diameter'],
+                'type_of_drive': obj['type_of_drive']}
diff --git a/sf_base/models/fixture.py b/sf_base/models/fixture.py
index 52e2baf7..f64fe473 100644
--- a/sf_base/models/fixture.py
+++ b/sf_base/models/fixture.py
@@ -26,10 +26,10 @@ class FixtureModel(models.Model):
     _name = 'sf.fixture.model'
     _description = "夹具型号"
 
-    name = fields.Char(string="名称", size=50, required=True)
-    fixture_material_id = fields.Many2one('sf.fixture.material', string="夹具物料", required=True)
+    name = fields.Char(string="名称", size=50)
+    fixture_material_id = fields.Many2one('sf.fixture.material', string="夹具物料")
     fixture_material_type = fields.Char(string="夹具物料类型", related='fixture_material_id.name')
-    multi_mounting_type_id = fields.Many2one('sf.multi_mounting.type', string="联装类型", required=True)
+    multi_mounting_type_id = fields.Many2one('sf.multi_mounting.type', string="联装类型")
     brand_id = fields.Many2one('sf.machine.brand', string="品牌")
     model_file = fields.Binary(string="图片")
     status = fields.Boolean('状态')
diff --git a/sf_base/views/fixture_view.xml b/sf_base/views/fixture_view.xml
index 692c3b7f..0e86738d 100644
--- a/sf_base/views/fixture_view.xml
+++ b/sf_base/views/fixture_view.xml
@@ -165,6 +165,7 @@
                             <field name="zero_chuck_ids"
                                    attrs="{'invisible': [('fixture_material_type', '!=', '零点卡盘')]}">
                                 <tree editable="bottom" class="center" delete="0">
+                                    <field name="code" invisible="1"/>
                                     <field name="name"/>
                                     <field name="length"/>
                                     <field name="width"/>
@@ -190,6 +191,7 @@
                             <field name="zero_tray_ids"
                                    attrs="{'invisible': [('fixture_material_type', '!=', '零点托盘')]}">
                                 <tree editable="bottom" class="center" delete="0">
+                                    <field name="code" invisible="1"/>
                                     <field name="name"/>
                                     <field name="length"/>
                                     <field name="width"/>
@@ -213,6 +215,7 @@
                             <field name="pneumatic_fixture_ids"
                                    attrs="{'invisible': [('fixture_material_type', '!=', '气动夹具')]}">
                                 <tree editable="bottom" class="center" delete="0">
+                                    <field name="code" invisible="1"/>
                                     <field name="name"/>
                                     <field name="length"/>
                                     <field name="width"/>
@@ -240,6 +243,7 @@
                             <field name="jaw_vice_fixture_ids"
                                    attrs="{'invisible': [('fixture_material_type', '!=', '虎钳夹具')]}">
                                 <tree editable="bottom" class="center" delete="0">
+                                    <field name="code" invisible="1"/>
                                     <field name="name"/>
                                     <field name="length"/>
                                     <field name="width"/>
@@ -268,6 +272,7 @@
                             <field name="magnet_fixture_ids"
                                    attrs="{'invisible': [('fixture_material_type', '!=', '磁吸夹具')]}">
                                 <tree editable="bottom" class="center" delete="0">
+                                    <field name="code" invisible="1"/>
                                     <field name="name"/>
                                     <field name="length"/>
                                     <field name="width"/>
@@ -297,6 +302,7 @@
                             <field name="adapter_board_fixture_ids"
                                    attrs="{'invisible': [('fixture_material_type', '!=', '转接板(锁板)夹具')]}">
                                 <tree editable="bottom" class="center" delete="0">
+                                    <field name="code" invisible="1"/>
                                     <field name="name"/>
                                     <field name="length"/>
                                     <field name="width"/>
@@ -323,6 +329,7 @@
                             <field name="scroll_chuck_ids"
                                    attrs="{'invisible': [('fixture_material_type', '!=', '三爪卡盘')]}">
                                 <tree editable="bottom" class="center" delete="0">
+                                    <field name="code" invisible="1"/>
                                     <field name="name"/>
                                     <field name="length"/>
                                     <field name="width"/>
diff --git a/sf_mrs_connect/models/sync_common.py b/sf_mrs_connect/models/sync_common.py
index d9e310e0..210194db 100644
--- a/sf_mrs_connect/models/sync_common.py
+++ b/sf_mrs_connect/models/sync_common.py
@@ -827,7 +827,8 @@ class MachineToolType(models.Model):
                 brand = self.env['sf.machine.brand'].search([('code', '=', item['brand_id'])])
                 jg_image_id = self.env['maintenance.equipment.image'].search([('name', 'in', item['jg_image_id'])]).ids
                 lq_image_id = self.env['maintenance.equipment.image'].search([('name', 'in', item['lq_image_id'])]).ids
-                category = self.env['sf.machine_tool.category'].search([('code', '=', item['machine_tool_category']), ('active', '=', True)], limit=1)
+                category = self.env['sf.machine_tool.category'].search(
+                    [('code', '=', item['machine_tool_category']), ('active', '=', True)], limit=1)
 
                 if not machine_tool_type:
                     self.create({
@@ -1475,90 +1476,62 @@ class SyncFixtureModel(models.Model):
                 for item in result['fixture_model_yesterday_list']:
                     if item:
                         fixture_model = self.search([("code", '=', item['code']), ('active', 'in', [True, False])])
-                        zero_chuck_list = []
-                        for zero_chuck_id in item['zero_chuck_ids']:
-                            zero_chuck_list.append(
-                                self.env['sf.fixture.materials.basic.parameters']._json_zero_chuck_param(zero_chuck_id))
-                        zero_tray_list = []
-                        for zero_tray_id in item['zero_tray_ids']:
-                            zero_tray_list.append(
-                                self.env['sf.fixture.materials.basic.parameters']._json_zero_tray_param(zero_tray_id))
-                        pneumatic_fixture_list = []
-                        for pneumatic_fixture_id in item['pneumatic_fixture_ids']:
-                            pneumatic_fixture_list.append(
-                                self.env['sf.fixture.materials.basic.parameters']._json_pneumatic_fixture_param(
-                                    pneumatic_fixture_id))
-                        jaw_vice_fixture_list = []
-                        for jaw_vice_fixture_id in item['jaw_vice_fixture_ids']:
-                            jaw_vice_fixture_list.append(
-                                self.env['sf.fixture.materials.basic.parameters']._json_jaw_vice_fixture_param(
-                                    jaw_vice_fixture_id))
-                        magnet_fixture_list = []
-                        for magnet_fixture_id in item['magnet_fixture_ids']:
-                            magnet_fixture_list.append(
-                                self.env['sf.fixture.materials.basic.parameters']._json_magnet_fixture_param(
-                                    magnet_fixture_id))
-                        adapter_board_fixture_list = []
-                        for adapter_board_fixture_id in item['adapter_board_fixture_ids']:
-                            adapter_board_fixture_list.append(
-                                self.env['sf.fixture.materials.basic.parameters']._json_adapter_board_fixture_param(
-                                    adapter_board_fixture_id))
-                        scroll_chuck_list = []
-                        for scroll_chuck_id in item['scroll_chuck_ids']:
-                            scroll_chuck_list.append(
-                                self.env['sf.fixture.materials.basic.parameters']._json_scroll_chuck_param(
-                                    scroll_chuck_id))
+                        fixture_materials = self.env['sf.fixture.materials.basic.parameters']
+                        val = {
+                            "name": item['name'],
+                            "code": item['code'],
+                            "fixture_material_id": self.env['sf.fixture.material'].search(
+                                [('code', '=', item['fixture_material_code'])]).id,
+                            "multi_mounting_type_id": self.env['sf.multi_mounting.type'].search(
+                                [('code', '=', item['multi_mounting_type_code'])]).id,
+                            "brand_id": self.env['sf.machine.brand'].search([('code', '=', item['brand_code'])]).id,
+                            "model_file": '' if not item['model_file'] else base64.b64decode(item['model_file']),
+                            "status": item['status'],
+                            "active": item['active'],
+                        }
                         if not fixture_model:
-                            self.create({
-                                "name": item['name'],
-                                "code": item['code'],
-                                "fixture_material_id": self.env['sf.fixture.material'].search(
-                                    [('code', '=', item['fixture_material_code'])]).id,
-                                "multi_mounting_type_id": self.env['sf.multi_mounting.type'].search(
-                                    [('code', '=', item['multi_mounting_type_code'])]).id,
-                                "brand_id": self.env['sf.machine.brand'].search([('code', '=', item['brand_code'])]).id,
-                                "model_file": '' if not item['model_file'] else base64.b64decode(item['model_file']),
-                                "zero_chuck_ids": zero_chuck_list,
-                                "zero_tray_ids": zero_tray_list,
-                                "pneumatic_fixture_ids": pneumatic_fixture_list,
-                                "jaw_vice_fixture_ids": jaw_vice_fixture_list,
-                                "magnet_fixture_ids": magnet_fixture_list,
-                                "adapter_board_fixture_ids": adapter_board_fixture_list,
-                                "scroll_chuck_ids": scroll_chuck_list,
-                                "status": item['status'],
-                                "active": item['active'],
-                            })
+                            fixture_model = self.create(val)
+                            fixture_material_name = fixture_model.fixture_material_id.name
+                            if item['zero_chuck_ids'] and fixture_material_name == '零点卡盘':
+                                fixture_materials.create_fixture_materials(item['zero_chuck_ids'], fixture_model)
+                            elif item['zero_tray_ids'] and fixture_material_name == '零点托盘':
+                                fixture_materials.create_fixture_materials(item['zero_tray_ids'], fixture_model)
+                            elif item['pneumatic_fixture_ids'] and fixture_material_name == '气动夹具':
+                                fixture_materials.create_fixture_materials(item['pneumatic_fixture_ids'], fixture_model)
+                            elif item['jaw_vice_fixture_ids'] and fixture_material_name == '虎钳夹具':
+                                fixture_materials.create_fixture_materials(item['jaw_vice_fixture_ids'], fixture_model)
+                            elif item['magnet_fixture_ids'] and fixture_material_name == '磁吸夹具':
+                                fixture_materials.create_fixture_materials(item['magnet_fixture_ids'], fixture_model)
+                            elif item['adapter_board_fixture_ids'] and fixture_material_name == '转接板(锁板)夹具':
+                                fixture_materials.create_fixture_materials(item['adapter_board_fixture_ids'],
+                                                                           fixture_model)
+                            elif item['scroll_chuck_ids'] and fixture_material_name == '三爪卡盘':
+                                fixture_materials.create_fixture_materials(item['scroll_chuck_ids'], fixture_model)
                         else:
-                            fixture_model.write({
-                                "zero_chuck_ids": [(5, 0, 0)],
-                                "zero_tray_ids": [(5, 0, 0)],
-                                "pneumatic_fixture_ids": [(5, 0, 0)],
-                                "jaw_vice_fixture_ids": [(5, 0, 0)],
-                                "magnet_fixture_ids": [(5, 0, 0)],
-                                "adapter_board_fixture_ids": [(5, 0, 0)],
-                                "scroll_chuck_ids": [(5, 0, 0)],
-                            })
-                            self.env['sf.fixture.materials.basic.parameters'].sudo().search(
-                                [('fixture_model_id', '=', False)]).unlink()
-                            fixture_model.write({
-                                "name": item['name'],
-                                "code": item['code'],
-                                "fixture_material_id": self.env['sf.fixture.material'].search(
-                                    [('code', '=', item['fixture_material_code'])]).id,
-                                "multi_mounting_type_id": self.env['sf.multi_mounting.type'].search(
-                                    [('code', '=', item['multi_mounting_type_code'])]).id,
-                                "brand_id": self.env['sf.machine.brand'].search([('code', '=', item['brand_code'])]).id,
-                                "model_file": '' if not item['model_file'] else base64.b64decode(item['model_file']),
-                                "zero_chuck_ids": zero_chuck_list,
-                                "zero_tray_ids": zero_tray_list,
-                                "pneumatic_fixture_ids": pneumatic_fixture_list,
-                                "jaw_vice_fixture_ids": jaw_vice_fixture_list,
-                                "magnet_fixture_ids": magnet_fixture_list,
-                                "adapter_board_fixture_ids": adapter_board_fixture_list,
-                                "scroll_chuck_ids": scroll_chuck_list,
-                                "status": item['status'],
-                                "active": item['active'],
-                            })
+                            fixture_model.write(val)
+                            fixture_material_name = fixture_model.fixture_material_id.name
+                            if item['zero_chuck_ids'] and fixture_material_name == '零点卡盘':
+                                fixture_materials.write_fixture_materials(item['zero_chuck_ids'], fixture_material_name)
+                            elif item['zero_tray_ids'] and fixture_material_name == '零点托盘':
+                                fixture_materials.write_fixture_materials(item['zero_tray_ids'], fixture_material_name)
+                            elif item['pneumatic_fixture_ids'] and fixture_material_name == '气动夹具':
+                                fixture_materials.write_fixture_materials(item['pneumatic_fixture_ids'],
+                                                                          fixture_material_name)
+                            elif item['jaw_vice_fixture_ids'] and fixture_material_name == '虎钳夹具':
+                                fixture_materials.write_fixture_materials(item['jaw_vice_fixture_ids'],
+                                                                          fixture_material_name)
+                            elif item['magnet_fixture_ids'] and fixture_material_name == '磁吸夹具':
+                                fixture_materials.write_fixture_materials(item['magnet_fixture_ids'],
+                                                                          fixture_material_name)
+                            elif item['adapter_board_fixture_ids'] and fixture_material_name == '转接板(锁板)夹具':
+                                fixture_materials.write_fixture_materials(item['adapter_board_fixture_ids'],
+                                                                          fixture_material_name)
+                            elif item['scroll_chuck_ids'] and fixture_material_name == '三爪卡盘':
+                                fixture_materials.write_fixture_materials(item['scroll_chuck_ids'],
+                                                                          fixture_material_name)
+                            else:
+                                self.env['sf.fixture.materials.basic.parameters'].sudo().search(
+                                    [('fixture_model_id', '=', fixture_model.id)]).unlink()
         else:
             raise ValidationError("夹具型号认证未通过")
 
@@ -1576,90 +1549,58 @@ class SyncFixtureModel(models.Model):
                 for item in result['fixture_model_all_list']:
                     if item:
                         fixture_model = self.search([('code', '=', item['code']), ('active', 'in', [True, False])])
-                        zero_chuck_list = []
-                        for zero_chuck_id in item['zero_chuck_ids']:
-                            zero_chuck_list.append(
-                                self.env['sf.fixture.materials.basic.parameters']._json_zero_chuck_param(zero_chuck_id))
-                        zero_tray_list = []
-                        for zero_tray_id in item['zero_tray_ids']:
-                            zero_tray_list.append(
-                                self.env['sf.fixture.materials.basic.parameters']._json_zero_tray_param(zero_tray_id))
-                        pneumatic_fixture_list = []
-                        for pneumatic_fixture_id in item['pneumatic_fixture_ids']:
-                            pneumatic_fixture_list.append(
-                                self.env['sf.fixture.materials.basic.parameters']._json_pneumatic_fixture_param(
-                                    pneumatic_fixture_id))
-                        jaw_vice_fixture_list = []
-                        for jaw_vice_fixture_id in item['jaw_vice_fixture_ids']:
-                            jaw_vice_fixture_list.append(
-                                self.env['sf.fixture.materials.basic.parameters']._json_jaw_vice_fixture_param(
-                                    jaw_vice_fixture_id))
-                        magnet_fixture_list = []
-                        for magnet_fixture_id in item['magnet_fixture_ids']:
-                            magnet_fixture_list.append(
-                                self.env['sf.fixture.materials.basic.parameters']._json_magnet_fixture_param(
-                                    magnet_fixture_id))
-                        adapter_board_fixture_list = []
-                        for adapter_board_fixture_id in item['adapter_board_fixture_ids']:
-                            adapter_board_fixture_list.append(
-                                self.env['sf.fixture.materials.basic.parameters']._json_adapter_board_fixture_param(
-                                    adapter_board_fixture_id))
-                        scroll_chuck_list = []
-                        for scroll_chuck_id in item['scroll_chuck_ids']:
-                            scroll_chuck_list.append(
-                                self.env['sf.fixture.materials.basic.parameters']._json_scroll_chuck_param(
-                                    scroll_chuck_id))
+                        fixture_materials = self.env['sf.fixture.materials.basic.parameters']
+                        val = {
+                            "name": item['name'],
+                            "code": item['code'],
+                            "fixture_material_id": self.env['sf.fixture.material'].search(
+                                [('code', '=', item['fixture_material_code'])]).id,
+                            "multi_mounting_type_id": self.env['sf.multi_mounting.type'].search(
+                                [('code', '=', item['multi_mounting_type_code'])]).id,
+                            "brand_id": self.env['sf.machine.brand'].search([('code', '=', item['brand_code'])]).id,
+                            "model_file": '' if not item['model_file'] else base64.b64decode(item['model_file']),
+                            "status": item['status'],
+                            "active": item['active'],
+                        }
                         if not fixture_model:
-                            self.create({
-                                "name": item['name'],
-                                "code": item['code'],
-                                "fixture_material_id": self.env['sf.fixture.material'].search(
-                                    [('code', '=', item['fixture_material_code'])]).id,
-                                "multi_mounting_type_id": self.env['sf.multi_mounting.type'].search(
-                                    [('code', '=', item['multi_mounting_type_code'])]).id,
-                                "brand_id": self.env['sf.machine.brand'].search([('code', '=', item['brand_code'])]).id,
-                                "model_file": '' if not item['model_file'] else base64.b64decode(item['model_file']),
-                                "zero_chuck_ids": zero_chuck_list,
-                                "zero_tray_ids": zero_tray_list,
-                                "pneumatic_fixture_ids": pneumatic_fixture_list,
-                                "jaw_vice_fixture_ids": jaw_vice_fixture_list,
-                                "magnet_fixture_ids": magnet_fixture_list,
-                                "adapter_board_fixture_ids": adapter_board_fixture_list,
-                                "scroll_chuck_ids": scroll_chuck_list,
-                                "status": item['status'],
-                                "active": item['active'],
-                            })
+                            fixture_model = self.create(val)
+                            fixture_material_name = fixture_model.fixture_material_id.name
+                            if item['zero_chuck_ids'] and fixture_material_name == '零点卡盘':
+                                fixture_materials.create_fixture_materials(item['zero_chuck_ids'], fixture_model)
+                            elif item['zero_tray_ids'] and fixture_material_name == '零点托盘':
+                                fixture_materials.create_fixture_materials(item['zero_tray_ids'], fixture_model)
+                            elif item['pneumatic_fixture_ids'] and fixture_material_name == '气动夹具':
+                                fixture_materials.create_fixture_materials(item['pneumatic_fixture_ids'], fixture_model)
+                            elif item['jaw_vice_fixture_ids'] and fixture_material_name == '虎钳夹具':
+                                fixture_materials.create_fixture_materials(item['jaw_vice_fixture_ids'], fixture_model)
+                            elif item['magnet_fixture_ids'] and fixture_material_name == '磁吸夹具':
+                                fixture_materials.create_fixture_materials(item['magnet_fixture_ids'], fixture_model)
+                            elif item['adapter_board_fixture_ids'] and fixture_material_name == '转接板(锁板)夹具':
+                                fixture_materials.create_fixture_materials(item['adapter_board_fixture_ids'],
+                                                                           fixture_model)
+                            elif item['scroll_chuck_ids'] and fixture_material_name == '三爪卡盘':
+                                fixture_materials.create_fixture_materials(item['scroll_chuck_ids'], fixture_model)
                         else:
-                            fixture_model.write({
-                                "zero_chuck_ids": [(5, 0, 0)],
-                                "zero_tray_ids": [(5, 0, 0)],
-                                "pneumatic_fixture_ids": [(5, 0, 0)],
-                                "jaw_vice_fixture_ids": [(5, 0, 0)],
-                                "magnet_fixture_ids": [(5, 0, 0)],
-                                "adapter_board_fixture_ids": [(5, 0, 0)],
-                                "scroll_chuck_ids": [(5, 0, 0)],
-                            })
-                            self.env['sf.fixture.materials.basic.parameters'].sudo().search(
-                                [('fixture_model_id', '=', False)]).unlink()
-                            fixture_model.write({
-                                "name": item['name'],
-                                "code": item['code'],
-                                "fixture_material_id": self.env['sf.fixture.material'].search(
-                                    [('code', '=', item['fixture_material_code'])]).id,
-                                "multi_mounting_type_id": self.env['sf.multi_mounting.type'].search(
-                                    [('code', '=', item['multi_mounting_type_code'])]).id,
-                                "brand_id": self.env['sf.machine.brand'].search([('code', '=', item['brand_code'])]).id,
-                                "model_file": '' if not item['model_file'] else base64.b64decode(item['model_file']),
-                                "zero_chuck_ids": zero_chuck_list,
-                                "zero_tray_ids": zero_tray_list,
-                                "pneumatic_fixture_ids": pneumatic_fixture_list,
-                                "jaw_vice_fixture_ids": jaw_vice_fixture_list,
-                                "magnet_fixture_ids": magnet_fixture_list,
-                                "adapter_board_fixture_ids": adapter_board_fixture_list,
-                                "scroll_chuck_ids": scroll_chuck_list,
-                                "status": item['status'],
-                                "active": item['active'],
-                            })
+                            fixture_model.write(val)
+                            fixture_material_name = fixture_model.fixture_material_id.name
+                            if item['zero_chuck_ids'] and fixture_material_name == '零点卡盘':
+                                fixture_materials.write_fixture_materials(item['zero_chuck_ids'], fixture_model)
+                            elif item['zero_tray_ids'] and fixture_material_name == '零点托盘':
+                                fixture_materials.write_fixture_materials(item['zero_tray_ids'], fixture_model)
+                            elif item['pneumatic_fixture_ids'] and fixture_material_name == '气动夹具':
+                                fixture_materials.write_fixture_materials(item['pneumatic_fixture_ids'], fixture_model)
+                            elif item['jaw_vice_fixture_ids'] and fixture_material_name == '虎钳夹具':
+                                fixture_materials.write_fixture_materials(item['jaw_vice_fixture_ids'], fixture_model)
+                            elif item['magnet_fixture_ids'] and fixture_material_name == '磁吸夹具':
+                                fixture_materials.write_fixture_materials(item['magnet_fixture_ids'], fixture_model)
+                            elif item['adapter_board_fixture_ids'] and fixture_material_name == '转接板(锁板)夹具':
+                                fixture_materials.write_fixture_materials(item['adapter_board_fixture_ids'],
+                                                                          fixture_model)
+                            elif item['scroll_chuck_ids'] and fixture_material_name == '三爪卡盘':
+                                fixture_materials.write_fixture_materials(item['scroll_chuck_ids'], fixture_model)
+                            else:
+                                self.env['sf.fixture.materials.basic.parameters'].sudo().search(
+                                    [('fixture_model_id', '=', fixture_model.id)]).unlink()
         else:
             raise ValidationError("夹具型号认证未通过")
 
@@ -2457,8 +2398,9 @@ class CuttingToolBasicParameters(models.Model):
                                     'cutting_tool_type': '整体式刀具',
                                     'standard_library_id': self.env['sf.cutting_tool.standard.library'].search(
                                         [(
-                                         'code', '=', integral_tool_item['standard_library_code'].replace("JKM", result[
-                                             'factory_short_name']))]).id,
+                                            'code', '=',
+                                            integral_tool_item['standard_library_code'].replace("JKM", result[
+                                                'factory_short_name']))]).id,
                                     'total_length': integral_tool_item['total_length'],
                                     'blade_diameter': integral_tool_item['blade_diameter'],
                                     'blade_length': integral_tool_item['blade_length'],
@@ -2825,8 +2767,9 @@ class CuttingToolBasicParameters(models.Model):
                                     'cutting_tool_type': '整体式刀具',
                                     'standard_library_id': self.env['sf.cutting_tool.standard.library'].search(
                                         [(
-                                         'code', '=', integral_tool_item['standard_library_code'].replace("JKM", result[
-                                             'factory_short_name']))]).id,
+                                            'code', '=',
+                                            integral_tool_item['standard_library_code'].replace("JKM", result[
+                                                'factory_short_name']))]).id,
                                     'total_length': integral_tool_item['total_length'],
                                     'blade_diameter': integral_tool_item['blade_diameter'],
                                     'blade_length': integral_tool_item['blade_length'],
diff --git a/sf_plan/models/custom_plan.py b/sf_plan/models/custom_plan.py
index d4402c98..5f0d254b 100644
--- a/sf_plan/models/custom_plan.py
+++ b/sf_plan/models/custom_plan.py
@@ -44,8 +44,9 @@ class sf_production_plan(models.Model):
     production_id = fields.Many2one('mrp.production', '关联制造订单')
     product_qty = fields.Float(string='数量', digits='Product Unit of Measure', required=True, default=0.0)
     production_line_id = fields.Many2one('sf.production.line', string='生产线')
-    date_planned_start = fields.Datetime(string='计划开始时间', required=True, index=True, copy=False,
-                                         default=fields.Datetime.now)
+    # date_planned_start = fields.Datetime(string='计划开始时间', required=True, index=True, copy=False,
+    #                                      default=fields.Datetime.now)
+    date_planned_start = fields.Datetime(string='计划开始时间')
     date_planned_finished = fields.Datetime(string='计划结束时间')
     # 排程设置selection(倒排，顺排，默认倒排）
     schedule_setting = fields.Selection([
@@ -80,7 +81,7 @@ class sf_production_plan(models.Model):
     def _compute_production_line_id(self):
         for item in self:
             item.sudo().production_id.production_line_id = item.production_line_id.id
-            item.sudo().production_id.plan_start_processing_time = item.date_planned_start
+            # item.sudo().production_id.plan_start_processing_time = item.date_planned_start
 
     # @api.onchange('state')
     # def _onchange_state(self):
@@ -198,7 +199,9 @@ class sf_production_plan(models.Model):
                     for item in record.production_id.workorder_ids:
                         if item.name == 'CNC加工':
                             item.date_planned_finished = datetime.now() + timedelta(days=100)
-                            item.date_planned_start = record.date_planned_start
+                            # item.date_planned_start = record.date_planned_start
+                            item.date_planned_start = datetime.now()
+                            record.sudo().production_id.plan_start_processing_time = item.date_planned_start
                             item.date_planned_finished = item.date_planned_start + timedelta(
                                 minutes=record.env['mrp.routing.workcenter'].sudo().search(
                                     [('name', '=', 'CNC加工')]).time_cycle)
@@ -291,6 +294,7 @@ class sf_production_plan(models.Model):
                 print('时间设置失败，请检查是否为工序分配工作中心，%s' % e)
 
     def cancel_production_schedule(self):
+        self.date_planned_start = False
         self.date_planned_finished = False
         self.state = 'draft'
         self.production_line_id = False
diff --git a/sf_plan/views/view.xml b/sf_plan/views/view.xml
index 38c7f4f8..1e7ff0f6 100644
--- a/sf_plan/views/view.xml
+++ b/sf_plan/views/view.xml
@@ -88,7 +88,7 @@
 
                             <group string="加工信息">
 
-                                <field name="date_planned_start"/>
+                                <field name="date_planned_start" placeholder="如果不选择计划开始时间，会取当前时间来做排程"/>
                                 <field name="date_planned_finished"/>
                                 <field name="actual_process_time"/>
                                 <field name="actual_start_time"/>
diff --git a/sf_tool_management/models/functional_tool_enroll.py b/sf_tool_management/models/functional_tool_enroll.py
index 0cfac5b7..1d954ed0 100644
--- a/sf_tool_management/models/functional_tool_enroll.py
+++ b/sf_tool_management/models/functional_tool_enroll.py
@@ -197,6 +197,12 @@ class FunctionalCuttingToolEntity(models.Model):
                 record.enroll_functional_tool_entity()
         return records
 
+    def write(self, vals):
+        res = super().write(vals)
+        if vals.get('current_location'):
+            self.enroll_functional_tool_entity()
+        return res
+
 
 class FunctionalToolWarning(models.Model):
     _inherit = 'sf.functional.tool.warning'
diff --git a/sf_warehouse/models/model.py b/sf_warehouse/models/model.py
index 3e691430..8e0a3116 100644
--- a/sf_warehouse/models/model.py
+++ b/sf_warehouse/models/model.py
@@ -424,6 +424,14 @@ class Sf_stock_move_line(models.Model):
     # lot_qr_code = fields.Binary(string='二维码', compute='_compute_lot_qr_code', store=True)
     lot_qr_code = fields.Binary(string='二维码', compute='_compute_lot_qr_code', store=True)
 
+    def action_revert_inventory(self):
+        # 检查用户是否有执行操作的权限
+        if not self.env.user.has_group('sf_warehouse.group_sf_stock_user'):
+            raise UserError(_('抱歉，只有库管人员可以执行此动作'))
+
+        # 如果用户有权限，调用父类方法
+        return super(CustomStockMoveLine, self).action_revert_inventory()
+
     @api.depends('lot_name')
     def _compute_lot_qr_code(self):
         for record in self:

From d4c786ff1ed6825ee4a013c36bdca697bb25fd5c Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Mon, 18 Mar 2024 14:46:49 +0800
Subject: [PATCH 5/9] =?UTF-8?q?1.=E9=80=89=E6=8B=A9=E8=A7=84=E5=88=99?=
 =?UTF-8?q?=EF=BC=8C=E5=B8=A6=E5=87=BA=E5=AF=B9=E5=BA=94=E5=9E=8B=E5=8F=B7?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/product_template.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py
index 053edafd..be0c09ae 100644
--- a/sf_manufacturing/models/product_template.py
+++ b/sf_manufacturing/models/product_template.py
@@ -331,6 +331,7 @@ class ResProductMo(models.Model):
                 (6, 0, self.cutting_tool_model_id.suitable_coolant_ids.ids)]
             self.compaction_way_id = self.cutting_tool_model_id.compaction_way_id.id
             self.fit_blade_shape_id = self.cutting_tool_model_id.fit_blade_shape_id.id
+            self.image_1920 = self.cutting_tool_model_id.image
         else:
             self.cutting_tool_type_id = False
             self.brand_id = False

From c470935cc5f230c16da321bf91c193309d4249e3 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Mon, 18 Mar 2024 17:15:34 +0800
Subject: [PATCH 6/9] =?UTF-8?q?1=E3=80=81=E5=88=A0=E9=99=A4=E5=A4=B9?=
 =?UTF-8?q?=E5=85=B7=E5=9E=8B=E5=8F=B7=E5=90=8C=E6=AD=A5=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84=E5=A4=B9=E5=85=B7=E5=9E=8B=E5=8F=B7=E5=9F=BA?=
 =?UTF-8?q?=E6=9C=AC=E5=8F=82=E6=95=B0=E7=9A=84=E6=95=B0=E6=8D=AE=EF=BC=9B?=
 =?UTF-8?q?2=E3=80=81=E6=96=B0=E5=A2=9E=E5=A4=B9=E5=85=B7=E5=9E=8B?=
 =?UTF-8?q?=E5=8F=B7=E5=9F=BA=E6=9C=AC=E5=8F=82=E6=95=B0=E6=A8=A1=E5=9E=8B?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E5=A4=B9=E5=85=B7=E5=9E=8B=E5=8F=B7=E5=9F=BA=E6=9C=AC=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E7=9A=84=E5=90=8C=E6=AD=A5=EF=BC=9B3=E3=80=81?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=80=E5=85=B7=E7=AE=A1=E7=90=86=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E4=B8=8B=E5=AD=90=E8=8F=9C=E5=8D=95=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=EF=BC=9B4=E3=80=81=E5=85=B3=E9=97=AD=E5=88=80=E5=85=B7?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E6=90=9C=E7=B4=A2=E6=A8=A1=E5=9E=8Bform?=
 =?UTF-8?q?=E8=A7=86=E5=9B=BE=E7=9A=84=E6=B3=A8=E5=86=8C=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_base/models/basic_parameters_fixture.py    | 145 +++++-----------
 sf_mrs_connect/models/res_config_setting.py   |   2 +
 sf_mrs_connect/models/sync_common.py          | 156 +++++++++---------
 sf_tool_management/views/menu_view.xml        |   8 +-
 .../views/tool_material_search.xml            |   8 +-
 5 files changed, 133 insertions(+), 186 deletions(-)

diff --git a/sf_base/models/basic_parameters_fixture.py b/sf_base/models/basic_parameters_fixture.py
index 1333d01f..e9469355 100644
--- a/sf_base/models/basic_parameters_fixture.py
+++ b/sf_base/models/basic_parameters_fixture.py
@@ -68,98 +68,30 @@ class BasicParametersFixture(models.Model):
     centering_diameter = fields.Float('定心直径(mm)', digits=(16, 2))
 
     code = fields.Char('编码')
+    active = fields.Boolean('有效', default=True)
 
-    def create_fixture_materials(self, fixture_materials_datas, fixture_model):
-        fixture_materials_name = fixture_model.fixture_material_id.name
+    def _get_basic_parameters_list(self, fixture_materials_data, fixture_materials_name):
         if fixture_materials_name == '零点卡盘':
-            for fixture_materials_data in fixture_materials_datas:
-                self.create(self._json_zero_chuck_param(fixture_materials_data, fixture_model))
+            return self._json_zero_chuck_param(fixture_materials_data)
         elif fixture_materials_name == '零点托盘':
-            for fixture_materials_data in fixture_materials_datas:
-                self.create(self._json_zero_tray_param(fixture_materials_data, fixture_model))
+            return self._json_zero_tray_param(fixture_materials_data)
         elif fixture_materials_name == '气动夹具':
-            for fixture_materials_data in fixture_materials_datas:
-                self.create(self._json_pneumatic_fixture_param(fixture_materials_data, fixture_model))
+            return self._json_pneumatic_fixture_param(fixture_materials_data)
         elif fixture_materials_name == '虎钳夹具':
-            for fixture_materials_data in fixture_materials_datas:
-                self.create(self._json_jaw_vice_fixture_param(fixture_materials_data, fixture_model))
+            return self._json_jaw_vice_fixture_param(fixture_materials_data)
         elif fixture_materials_name == '磁吸夹具':
-            for fixture_materials_data in fixture_materials_datas:
-                self.create(self._json_magnet_fixture_param(fixture_materials_data, fixture_model))
+            return self._json_magnet_fixture_param(fixture_materials_data)
         elif fixture_materials_name == '转接板(锁板)夹具':
-            for fixture_materials_data in fixture_materials_datas:
-                self.create(self._json_adapter_board_fixture_param(fixture_materials_data, fixture_model))
+            return self._json_adapter_board_fixture_param(fixture_materials_data)
         elif fixture_materials_name == '三爪卡盘':
-            for fixture_materials_data in fixture_materials_datas:
-                self.create(self._json_scroll_chuck_param(fixture_materials_data, fixture_model))
+            return self._json_scroll_chuck_param(fixture_materials_data)
+        return {}
 
-    def write_fixture_materials(self, fixture_materials_datas, fixture_model):
-        fixture_materials_name = fixture_model.fixture_material_id.name
-        # cloud夹具物料的code
-        mrs_fixture_materials_codes = []
-        for fixture_materials_data in fixture_materials_datas:
-            mrs_fixture_materials_codes.append(fixture_materials_data.get('code'))
-        # sf夹具物料的code 判断sf夹具型号关联的夹具物料在同步过来的mrs夹具物料中是否存在，不存在则删除
-        sf_materials_model_codes = self._get_sf_materials_model_codes(fixture_model)
-        for sf_materials_model_code in sf_materials_model_codes:
-            if sf_materials_model_code not in mrs_fixture_materials_codes:
-                self.search([('code', '=', sf_materials_model_code)]).sudo().unlink()
-
-        for fixture_materials_data in fixture_materials_datas:
-            fixture_materials_list = self._get_fixture_materials_list(fixture_materials_data, fixture_materials_name,
-                                                                      fixture_model)
-            fixture_materials_code = fixture_materials_list.get('code')
-            # 判断同步过来的mrs刀具物料在sf夹具型号关联的夹具物料中是否存在，如果存在则修改，如果不存在则创建
-            if fixture_materials_code in sf_materials_model_codes:
-                self.search([('code', '=', fixture_materials_code)]).sudo().write(fixture_materials_list)
-            else:
-                self.sudo().create(fixture_materials_list)
-
-    def _get_sf_materials_model_codes(self, fixture_model):
-        fixture_materials_name = fixture_model.fixture_material_id.name
-        if fixture_materials_name == '零点卡盘':
-            return self._get_sf_materials_model_code(fixture_model.zero_chuck_ids)
-        elif fixture_materials_name == '零点托盘':
-            return self._get_sf_materials_model_code(fixture_model.zero_tray_ids)
-        elif fixture_materials_name == '气动夹具':
-            return self._get_sf_materials_model_code(fixture_model.pneumatic_fixture_ids)
-        elif fixture_materials_name == '虎钳夹具':
-            return self._get_sf_materials_model_code(fixture_model.pneumatic_fixture_ids)
-        elif fixture_materials_name == '磁吸夹具':
-            return self._get_sf_materials_model_code(fixture_model.magnet_fixture_ids)
-        elif fixture_materials_name == '转接板(锁板)夹具':
-            return self._get_sf_materials_model_code(fixture_model.adapter_board_fixture_ids)
-        elif fixture_materials_name == '三爪卡盘':
-            return self._get_sf_materials_model_code(fixture_model.scroll_chuck_ids)
-        return False
-
-    def _get_sf_materials_model_code(self, fixture_materials_ids):
-        sf_materials_model_codes = []
-        for fixture_materials_id in fixture_materials_ids:
-            sf_materials_model_codes.append(fixture_materials_id.code)
-        return sf_materials_model_codes
-
-    def _get_fixture_materials_list(self, fixture_materials_data, fixture_materials_name, fixture_model):
-        if fixture_materials_name == '零点卡盘':
-            return self._json_zero_chuck_param(fixture_materials_data, fixture_model)
-        elif fixture_materials_name == '零点托盘':
-            return self._json_zero_tray_param(fixture_materials_data, fixture_model)
-        elif fixture_materials_name == '气动夹具':
-            return self._json_pneumatic_fixture_param(fixture_materials_data, fixture_model)
-        elif fixture_materials_name == '虎钳夹具':
-            return self._json_jaw_vice_fixture_param(fixture_materials_data, fixture_model)
-        elif fixture_materials_name == '磁吸夹具':
-            return self._json_magnet_fixture_param(fixture_materials_data, fixture_model)
-        elif fixture_materials_name == '转接板(锁板)夹具':
-            return self._json_adapter_board_fixture_param(fixture_materials_data, fixture_model)
-        elif fixture_materials_name == '三爪卡盘':
-            return self._json_scroll_chuck_param(fixture_materials_data, fixture_model)
-        return False
-
-    def _json_zero_chuck_param(self, obj, fixture_model):
+    def _json_zero_chuck_param(self, obj):
         """零点卡盘：将data数据转换成list数据"""
         return {'code': obj['code'],
-                'fixture_model_id': fixture_model.id,
+                'fixture_model_id': self.env['sf.fixture.model'].sudo().search(
+                    [('code', '=', obj.get('fixture_model_code'))]).id,
                 'name': obj['name'],
                 'length': obj['length'],
                 'width': obj['width'],
@@ -179,12 +111,14 @@ class BasicParametersFixture(models.Model):
                 'materials_model_id': self.env['sf.materials.model'].sudo().search(
                     [('materials_no', '=', obj['materials_model_id']), ('active', '=', True)]).id,
                 'machine_tool_type_id': self.env['sf.machine_tool.type'].sudo().search(
-                    [('code', '=', obj['machine_tool_type_id']), ('active', '=', True)]).id}
+                    [('code', '=', obj['machine_tool_type_id']), ('active', '=', True)]).id,
+                'active': obj['active']}
 
-    def _json_zero_tray_param(self, obj, fixture_model):
+    def _json_zero_tray_param(self, obj):
         """零点托盘：将data数据转换成list数据"""
         return {'code': obj['code'],
-                'fixture_model_id': fixture_model.id,
+                'fixture_model_id': self.env['sf.fixture.model'].sudo().search(
+                    [('code', '=', obj.get('fixture_model_code'))]).id,
                 'name': obj['name'],
                 'length': obj['length'],
                 'width': obj['width'],
@@ -201,12 +135,14 @@ class BasicParametersFixture(models.Model):
                 'carrying_capacity_max': obj['carrying_capacity_max'],
                 'materials_model_id': self.env['sf.materials.model'].sudo().search(
                     [('materials_no', '=', obj['materials_model_id']), ('active', '=', True)]).id,
-                'rigidity': obj['rigidity']}
+                'rigidity': obj['rigidity'],
+                'active': obj['active']}
 
-    def _json_pneumatic_fixture_param(self, obj, fixture_model):
+    def _json_pneumatic_fixture_param(self, obj):
         """气动夹具：将data数据转换成list数据"""
         return {'code': obj['code'],
-                'fixture_model_id': fixture_model.id,
+                'fixture_model_id': self.env['sf.fixture.model'].sudo().search(
+                    [('code', '=', obj.get('fixture_model_code'))]).id,
                 'name': obj['name'],
                 'length': obj['length'],
                 'width': obj['width'],
@@ -228,12 +164,14 @@ class BasicParametersFixture(models.Model):
                 'rigidity': obj['rigidity'],
                 'interface_materials_model_id': self.env['sf.materials.model'].sudo().search(
                     [('materials_no', '=', obj['materials_model_id']), ('active', '=', True)]).id,
-                'type_of_drive': obj['type_of_drive']}
+                'type_of_drive': obj['type_of_drive'],
+                'active': obj['active']}
 
-    def _json_jaw_vice_fixture_param(self, obj, fixture_model):
+    def _json_jaw_vice_fixture_param(self, obj):
         """虎钳夹具：将data数据转换成list数据"""
         return {'code': obj['code'],
-                'fixture_model_id': fixture_model.id,
+                'fixture_model_id': self.env['sf.fixture.model'].sudo().search(
+                    [('code', '=', obj.get('fixture_model_code'))]).id,
                 'name': obj['name'],
                 'length': obj['length'],
                 'width': obj['width'],
@@ -256,12 +194,14 @@ class BasicParametersFixture(models.Model):
                 'rigidity': obj['rigidity'],
                 'interface_materials_model_id': self.env['sf.materials.model'].sudo().search(
                     [('materials_no', '=', obj['materials_model_id']), ('active', '=', True)]).id,
-                'type_of_drive': obj['type_of_drive']}
+                'type_of_drive': obj['type_of_drive'],
+                'active': obj['active']}
 
-    def _json_magnet_fixture_param(self, obj, fixture_model):
+    def _json_magnet_fixture_param(self, obj):
         """磁吸夹具：将data数据转换成list数据"""
         return {'code': obj['code'],
-                'fixture_model_id': fixture_model.id,
+                'fixture_model_id': self.env['sf.fixture.model'].sudo().search(
+                    [('code', '=', obj.get('fixture_model_code'))]).id,
                 'name': obj['name'],
                 'length': obj['length'],
                 'width': obj['width'],
@@ -285,12 +225,14 @@ class BasicParametersFixture(models.Model):
                 'rigidity': obj['rigidity'],
                 'interface_materials_model_id': self.env['sf.materials.model'].sudo().search(
                     [('materials_no', '=', obj['materials_model_id']), ('active', '=', True)]).id,
-                'type_of_drive': obj['type_of_drive']}
+                'type_of_drive': obj['type_of_drive'],
+                'active': obj['active']}
 
-    def _json_adapter_board_fixture_param(self, obj, fixture_model):
+    def _json_adapter_board_fixture_param(self, obj):
         """转接板(锁板)夹具：将data数据转换成list数据"""
         return {'code': obj['code'],
-                'fixture_model_id': fixture_model.id,
+                'fixture_model_id': self.env['sf.fixture.model'].sudo().search(
+                    [('code', '=', obj.get('fixture_model_code'))]).id,
                 'name': obj['name'],
                 'length': obj['length'],
                 'width': obj['width'],
@@ -311,12 +253,14 @@ class BasicParametersFixture(models.Model):
                 'rigidity': obj['rigidity'],
                 'screw_size': obj['screw_size'],
                 'via_hole_diameter': obj['via_hole_diameter'],
-                'type_of_drive': obj['type_of_drive']}
+                'type_of_drive': obj['type_of_drive'],
+                'active': obj['active']}
 
-    def _json_scroll_chuck_param(self, obj, fixture_model):
+    def _json_scroll_chuck_param(self, obj):
         """转接板(锁板)夹具：将data数据转换成list数据"""
         return {'code': obj['code'],
-                'fixture_model_id': fixture_model.id,
+                'fixture_model_id': self.env['sf.fixture.model'].sudo().search(
+                    [('code', '=', obj.get('fixture_model_code'))]).id,
                 'name': obj['name'],
                 'length': obj['length'],
                 'width': obj['width'],
@@ -338,4 +282,5 @@ class BasicParametersFixture(models.Model):
                 'rigidity': obj['rigidity'],
                 'mounting_hole_depth': obj['mounting_hole_depth'],
                 'centering_diameter': obj['centering_diameter'],
-                'type_of_drive': obj['type_of_drive']}
+                'type_of_drive': obj['type_of_drive'],
+                'active': obj['active']}
diff --git a/sf_mrs_connect/models/res_config_setting.py b/sf_mrs_connect/models/res_config_setting.py
index 5919e5c7..7c10f8b1 100644
--- a/sf_mrs_connect/models/res_config_setting.py
+++ b/sf_mrs_connect/models/res_config_setting.py
@@ -60,6 +60,8 @@ class ResConfigSettings(models.TransientModel):
             _logger.info("同步联装类型完成")
             self.env['sf.fixture.model'].sync_all_fixture_model()
             _logger.info("同步夹具型号完成")
+            self.env['sf.fixture.materials.basic.parameters'].sync_all_fixture_materials_basic_parameters()
+            _logger.info("同步夹具型号基本信息完成")
             self.env['sf.functional.fixture.type'].sync_all_functional_fixture_type()
             _logger.info("同步夹具型号类型完成")
             self.env['sf.machine_tool.type'].sync_all_machine_tool_type()
diff --git a/sf_mrs_connect/models/sync_common.py b/sf_mrs_connect/models/sync_common.py
index 210194db..5cbfa8ec 100644
--- a/sf_mrs_connect/models/sync_common.py
+++ b/sf_mrs_connect/models/sync_common.py
@@ -50,6 +50,10 @@ class MrStaticResourceDataSync(models.Model):
             logging.info("联装类型已每日同步成功")
             self.env['sf.fixture.model'].sync_fixture_model_yesterday()
             logging.info("夹具型号已每日同步成功")
+            self.env['sf.fixture.materials.basic.parameters'].sync_fixture_materials_basic_parameters_yesterday()
+            logging.info("夹具型号基本参数已每日同步成功")
+            self.env['sf.functional.fixture.type'].sync_fixture_materials_basic_parameters_yesterday()
+            logging.info("夹具型号基本参数已每日同步成功")
             self.env['sf.functional.fixture.type'].sync_functional_fixture_type_yesterday()
             logging.info("功能夹具类型已每日同步成功")
             self.env['sf.cutting.tool.material'].sync_cutting_tool_material_yesterday()
@@ -1476,7 +1480,6 @@ class SyncFixtureModel(models.Model):
                 for item in result['fixture_model_yesterday_list']:
                     if item:
                         fixture_model = self.search([("code", '=', item['code']), ('active', 'in', [True, False])])
-                        fixture_materials = self.env['sf.fixture.materials.basic.parameters']
                         val = {
                             "name": item['name'],
                             "code": item['code'],
@@ -1490,48 +1493,10 @@ class SyncFixtureModel(models.Model):
                             "active": item['active'],
                         }
                         if not fixture_model:
-                            fixture_model = self.create(val)
-                            fixture_material_name = fixture_model.fixture_material_id.name
-                            if item['zero_chuck_ids'] and fixture_material_name == '零点卡盘':
-                                fixture_materials.create_fixture_materials(item['zero_chuck_ids'], fixture_model)
-                            elif item['zero_tray_ids'] and fixture_material_name == '零点托盘':
-                                fixture_materials.create_fixture_materials(item['zero_tray_ids'], fixture_model)
-                            elif item['pneumatic_fixture_ids'] and fixture_material_name == '气动夹具':
-                                fixture_materials.create_fixture_materials(item['pneumatic_fixture_ids'], fixture_model)
-                            elif item['jaw_vice_fixture_ids'] and fixture_material_name == '虎钳夹具':
-                                fixture_materials.create_fixture_materials(item['jaw_vice_fixture_ids'], fixture_model)
-                            elif item['magnet_fixture_ids'] and fixture_material_name == '磁吸夹具':
-                                fixture_materials.create_fixture_materials(item['magnet_fixture_ids'], fixture_model)
-                            elif item['adapter_board_fixture_ids'] and fixture_material_name == '转接板(锁板)夹具':
-                                fixture_materials.create_fixture_materials(item['adapter_board_fixture_ids'],
-                                                                           fixture_model)
-                            elif item['scroll_chuck_ids'] and fixture_material_name == '三爪卡盘':
-                                fixture_materials.create_fixture_materials(item['scroll_chuck_ids'], fixture_model)
+                            self.create(val)
                         else:
                             fixture_model.write(val)
-                            fixture_material_name = fixture_model.fixture_material_id.name
-                            if item['zero_chuck_ids'] and fixture_material_name == '零点卡盘':
-                                fixture_materials.write_fixture_materials(item['zero_chuck_ids'], fixture_material_name)
-                            elif item['zero_tray_ids'] and fixture_material_name == '零点托盘':
-                                fixture_materials.write_fixture_materials(item['zero_tray_ids'], fixture_material_name)
-                            elif item['pneumatic_fixture_ids'] and fixture_material_name == '气动夹具':
-                                fixture_materials.write_fixture_materials(item['pneumatic_fixture_ids'],
-                                                                          fixture_material_name)
-                            elif item['jaw_vice_fixture_ids'] and fixture_material_name == '虎钳夹具':
-                                fixture_materials.write_fixture_materials(item['jaw_vice_fixture_ids'],
-                                                                          fixture_material_name)
-                            elif item['magnet_fixture_ids'] and fixture_material_name == '磁吸夹具':
-                                fixture_materials.write_fixture_materials(item['magnet_fixture_ids'],
-                                                                          fixture_material_name)
-                            elif item['adapter_board_fixture_ids'] and fixture_material_name == '转接板(锁板)夹具':
-                                fixture_materials.write_fixture_materials(item['adapter_board_fixture_ids'],
-                                                                          fixture_material_name)
-                            elif item['scroll_chuck_ids'] and fixture_material_name == '三爪卡盘':
-                                fixture_materials.write_fixture_materials(item['scroll_chuck_ids'],
-                                                                          fixture_material_name)
-                            else:
-                                self.env['sf.fixture.materials.basic.parameters'].sudo().search(
-                                    [('fixture_model_id', '=', fixture_model.id)]).unlink()
+
         else:
             raise ValidationError("夹具型号认证未通过")
 
@@ -1549,7 +1514,6 @@ class SyncFixtureModel(models.Model):
                 for item in result['fixture_model_all_list']:
                     if item:
                         fixture_model = self.search([('code', '=', item['code']), ('active', 'in', [True, False])])
-                        fixture_materials = self.env['sf.fixture.materials.basic.parameters']
                         val = {
                             "name": item['name'],
                             "code": item['code'],
@@ -1563,48 +1527,84 @@ class SyncFixtureModel(models.Model):
                             "active": item['active'],
                         }
                         if not fixture_model:
-                            fixture_model = self.create(val)
-                            fixture_material_name = fixture_model.fixture_material_id.name
-                            if item['zero_chuck_ids'] and fixture_material_name == '零点卡盘':
-                                fixture_materials.create_fixture_materials(item['zero_chuck_ids'], fixture_model)
-                            elif item['zero_tray_ids'] and fixture_material_name == '零点托盘':
-                                fixture_materials.create_fixture_materials(item['zero_tray_ids'], fixture_model)
-                            elif item['pneumatic_fixture_ids'] and fixture_material_name == '气动夹具':
-                                fixture_materials.create_fixture_materials(item['pneumatic_fixture_ids'], fixture_model)
-                            elif item['jaw_vice_fixture_ids'] and fixture_material_name == '虎钳夹具':
-                                fixture_materials.create_fixture_materials(item['jaw_vice_fixture_ids'], fixture_model)
-                            elif item['magnet_fixture_ids'] and fixture_material_name == '磁吸夹具':
-                                fixture_materials.create_fixture_materials(item['magnet_fixture_ids'], fixture_model)
-                            elif item['adapter_board_fixture_ids'] and fixture_material_name == '转接板(锁板)夹具':
-                                fixture_materials.create_fixture_materials(item['adapter_board_fixture_ids'],
-                                                                           fixture_model)
-                            elif item['scroll_chuck_ids'] and fixture_material_name == '三爪卡盘':
-                                fixture_materials.create_fixture_materials(item['scroll_chuck_ids'], fixture_model)
+                            self.create(val)
                         else:
                             fixture_model.write(val)
-                            fixture_material_name = fixture_model.fixture_material_id.name
-                            if item['zero_chuck_ids'] and fixture_material_name == '零点卡盘':
-                                fixture_materials.write_fixture_materials(item['zero_chuck_ids'], fixture_model)
-                            elif item['zero_tray_ids'] and fixture_material_name == '零点托盘':
-                                fixture_materials.write_fixture_materials(item['zero_tray_ids'], fixture_model)
-                            elif item['pneumatic_fixture_ids'] and fixture_material_name == '气动夹具':
-                                fixture_materials.write_fixture_materials(item['pneumatic_fixture_ids'], fixture_model)
-                            elif item['jaw_vice_fixture_ids'] and fixture_material_name == '虎钳夹具':
-                                fixture_materials.write_fixture_materials(item['jaw_vice_fixture_ids'], fixture_model)
-                            elif item['magnet_fixture_ids'] and fixture_material_name == '磁吸夹具':
-                                fixture_materials.write_fixture_materials(item['magnet_fixture_ids'], fixture_model)
-                            elif item['adapter_board_fixture_ids'] and fixture_material_name == '转接板(锁板)夹具':
-                                fixture_materials.write_fixture_materials(item['adapter_board_fixture_ids'],
-                                                                          fixture_model)
-                            elif item['scroll_chuck_ids'] and fixture_material_name == '三爪卡盘':
-                                fixture_materials.write_fixture_materials(item['scroll_chuck_ids'], fixture_model)
-                            else:
-                                self.env['sf.fixture.materials.basic.parameters'].sudo().search(
-                                    [('fixture_model_id', '=', fixture_model.id)]).unlink()
         else:
             raise ValidationError("夹具型号认证未通过")
 
 
+class SyncfixtureMaterialsBasicParameters(models.Model):
+    _inherit = 'sf.fixture.materials.basic.parameters'
+    _description = '同步夹具型号基本参数列表'
+
+    url = '/api/fixture_parameters/list'
+
+    # 定时同步夹具型号基本信息
+    def sync_fixture_materials_basic_parameters_yesterday(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.url
+        r = requests.post(strUrl, json={}, data=None, headers=headers)
+        r = r.json()
+        result = json.loads(r['result'])
+        if result['status'] == 1:
+            if result.get('fixture_parameters_yesterday_list'):
+                all_list = result.get('fixture_parameters_yesterday_list')
+                if all_list.get('zero_chuck_all_list'):
+                    self._write_or_create(all_list.get('zero_chuck_yesterday_list'), '零点卡盘')
+                if all_list.get('zero_tray_all_list'):
+                    self._write_or_create(all_list.get('zero_tray_yesterday_list'), '零点托盘')
+                if all_list.get('pneumatic_fixture_all_list'):
+                    self._write_or_create(all_list.get('pneumatic_fixture_yesterday_list'), '气动夹具')
+                if all_list.get('jaw_vice_all_list'):
+                    self._write_or_create(all_list.get('jaw_vice_yesterday_list'), '虎钳夹具')
+                if all_list.get('magnet_fixture_all_list'):
+                    self._write_or_create(all_list.get('magnet_fixture_yesterday_list'), '磁吸夹具')
+                if all_list.get('adapter_board_all_list'):
+                    self._write_or_create(all_list.get('adapter_board_yesterday_list'), '转接板(锁板)夹具')
+                if all_list.get('scroll_chuck_all_list'):
+                    self._write_or_create(all_list.get('scroll_chuck_yesterday_list'), '三爪卡盘')
+        else:
+            raise ValidationError("夹具型号基本参数认证未通过")
+
+    # 定时同步所有夹具型号基本信息
+    def sync_all_fixture_materials_basic_parameters(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.url
+        r = requests.post(strUrl, json={}, data=None, headers=headers)
+        r = r.json()
+        result = json.loads(r['result'])
+        if result['status'] == 1:
+            if result.get('fixture_parameters_all_list'):
+                all_list = result.get('fixture_parameters_all_list')
+                if all_list.get('zero_chuck_all_list'):
+                    self._write_or_create(all_list.get('zero_chuck_all_list'), '零点卡盘')
+                if all_list.get('zero_tray_all_list'):
+                    self._write_or_create(all_list.get('zero_tray_all_list'), '零点托盘')
+                if all_list.get('pneumatic_fixture_all_list'):
+                    self._write_or_create(all_list.get('pneumatic_fixture_all_list'), '气动夹具')
+                if all_list.get('jaw_vice_all_list'):
+                    self._write_or_create(all_list.get('jaw_vice_all_list'), '虎钳夹具')
+                if all_list.get('magnet_fixture_all_list'):
+                    self._write_or_create(all_list.get('magnet_fixture_all_list'), '磁吸夹具')
+                if all_list.get('adapter_board_all_list'):
+                    self._write_or_create(all_list.get('adapter_board_all_list'), '转接板(锁板)夹具')
+                if all_list.get('scroll_chuck_all_list'):
+                    self._write_or_create(all_list.get('scroll_chuck_all_list'), '三爪卡盘')
+        else:
+            raise ValidationError("夹具型号基本参数认证未通过")
+
+    def _write_or_create(self, fixture_parameters_list, material_name):
+        for item in fixture_parameters_list:
+            if item:
+                basic_parameters = self.search([('code', '=', item.get('code')), ('active', 'in', [True, False])])
+                if not basic_parameters:
+                    self.create(self._get_basic_parameters_list(item, material_name))
+                else:
+                    basic_parameters.write(self._get_basic_parameters_list(item, material_name))
+
 class SyncFunctionalFixtureType(models.Model):
     _inherit = 'sf.functional.fixture.type'
     _description = '同步功能夹具类型列表'
diff --git a/sf_tool_management/views/menu_view.xml b/sf_tool_management/views/menu_view.xml
index c1fc939b..ea2e0fbd 100644
--- a/sf_tool_management/views/menu_view.xml
+++ b/sf_tool_management/views/menu_view.xml
@@ -10,8 +10,8 @@
         <menuitem
                 id="menu_sf_functional_cutting_tool"
                 parent="menu_sf_tool_manage"
-                name="功能刀具列表"
-                sequence="4"
+                name="功能刀具"
+                sequence="2"
                 action="sf_function_tool_entry_list_view_act"
         />
 
@@ -34,7 +34,7 @@
 
         <menuitem
                 sequence="6"
-                name="功能刀具出入库记录"
+                name="功能刀具出入库"
                 id="menu_sf_function_tool_entry_exit_records"
                 action="sf_inbound_and_outbound_records_of_functional_tools_view_act"
                 parent="menu_sf_tool_manage"
@@ -64,7 +64,7 @@
         />
 
         <menuitem
-                sequence="2"
+                sequence="4"
                 name="功能刀具组装"
                 id="menu_sf_functional_tool_assembly"
                 action="sf_functional_tool_assembly_view_act"
diff --git a/sf_tool_management/views/tool_material_search.xml b/sf_tool_management/views/tool_material_search.xml
index 3f71c754..fe08da42 100644
--- a/sf_tool_management/views/tool_material_search.xml
+++ b/sf_tool_management/views/tool_material_search.xml
@@ -22,9 +22,9 @@
             <field name="model">sf.tool.material.search</field>
             <field name="arch" type="xml">
                 <form string="刀具物料查询" create="0">
-                    <header>
-                        <button string="刀具物料注册" name="enroll_tool_material" type="object" class="btn-primary"/>
-                    </header>
+<!--                    <header>-->
+<!--                        <button string="刀具物料注册" name="enroll_tool_material" type="object" class="btn-primary"/>-->
+<!--                    </header>-->
                     <sheet>
                         <div class="oe_title">
                             <h1>
@@ -62,7 +62,7 @@
                                     <tree>
                                         <field name="name"/>
                                         <field name="tool_material_status"/>
-                                        <button name="enroll_tool_material_stock" string="序列号注册" type="object" class="btn-primary"/>
+<!--                                        <button name="enroll_tool_material_stock" string="序列号注册" type="object" class="btn-primary"/>-->
                                     </tree>
                                 </field>
                             </page>

From 3458deef0976a95eaa394f75684fada9a76ca7c4 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Tue, 19 Mar 2024 10:26:55 +0800
Subject: [PATCH 7/9] =?UTF-8?q?1=E3=80=81=E8=A7=A3=E5=86=B3=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E5=88=80=E5=85=B7=E7=BB=84=E8=A3=85=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E5=B7=B2=E4=BD=BF=E7=94=A8=E5=88=80=E5=85=B7=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E8=BF=98=E8=83=BD=E5=86=8D=E9=80=89=E5=88=B0=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=EF=BC=9B2=E3=80=81=E8=A7=A3=E5=86=B3=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E5=88=80=E5=85=B7=E7=BB=84=E8=A3=85=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E5=90=8E=E7=9A=84=E5=8A=9F=E8=83=BD=E5=88=80=E5=85=B7=E6=B3=A8?=
 =?UTF-8?q?=E5=86=8C=E5=88=B0cloud=E6=B2=A1=E6=9C=89=E7=BC=96=E7=A0=81?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=9B3=E3=80=81=E5=88=80?=
 =?UTF-8?q?=E5=85=B7=E7=89=A9=E6=96=99=E6=B7=BB=E5=8A=A0=E6=9C=AA=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E7=8A=B6=E6=80=81=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_mrs_connect/models/sync_common.py          |  1 +
 sf_tool_management/models/base.py             |  2 +-
 .../models/maintenance_equipment.py           | 11 ++++++----
 sf_tool_management/wizard/wizard.py           | 20 +++++++------------
 4 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/sf_mrs_connect/models/sync_common.py b/sf_mrs_connect/models/sync_common.py
index 5cbfa8ec..49956f4b 100644
--- a/sf_mrs_connect/models/sync_common.py
+++ b/sf_mrs_connect/models/sync_common.py
@@ -1605,6 +1605,7 @@ class SyncfixtureMaterialsBasicParameters(models.Model):
                 else:
                     basic_parameters.write(self._get_basic_parameters_list(item, material_name))
 
+
 class SyncFunctionalFixtureType(models.Model):
     _inherit = 'sf.functional.fixture.type'
     _description = '同步功能夹具类型列表'
diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py
index 6c02bcc1..2c4b4364 100644
--- a/sf_tool_management/models/base.py
+++ b/sf_tool_management/models/base.py
@@ -14,7 +14,7 @@ class FunctionalCuttingToolEntity(models.Model):
     _description = '功能刀具列表'
 
     tool_groups_id = fields.Many2one('sf.tool.groups', '刀具组', related='functional_tool_name_id.tool_groups_id')
-    code = fields.Char('编码', related='functional_tool_name_id.code')
+    code = fields.Char('编码')
     rfid = fields.Char('rfid', readonly=True)
     name = fields.Char('名称')
     functional_tool_name_id = fields.Many2one('sf.functional.tool.assembly', string='功能刀具名称', readonly=True)
diff --git a/sf_tool_management/models/maintenance_equipment.py b/sf_tool_management/models/maintenance_equipment.py
index d4eeafad..5f2465bf 100644
--- a/sf_tool_management/models/maintenance_equipment.py
+++ b/sf_tool_management/models/maintenance_equipment.py
@@ -97,18 +97,21 @@ class StockLot(models.Model):
     _inherit = 'stock.lot'
 
     tool_material_search_id = fields.Many2one('sf.tool.material.search', string='刀具物料搜索')
-    tool_material_status = fields.Selection([('可用', '可用'), ('在用', '在用'), ('报废', '报废')], string='状态',
-                                            compute='_compute_tool_material_status', store=True)
+    tool_material_status = fields.Selection(
+        [('未入库', '未入库'), ('可用', '可用'), ('在用', '在用'), ('报废', '报废')], string='状态',
+        compute='_compute_tool_material_status', store=True)
 
     @api.depends('quant_ids')
     def _compute_tool_material_status(self):
         for record in self:
             if record:
                 if record.quant_ids:
-                    if record.quant_ids[-1].location_id.name == '刀具组装位置':
+                    if record.quant_ids[-1].location_id.name == '刀具房':
+                        record.tool_material_status = '可用'
+                    elif record.quant_ids[-1].location_id.name == '刀具组装位置':
                         record.tool_material_status = '在用'
                     else:
-                        record.tool_material_status = '可用'
+                        record.tool_material_status = '未入库'
 
     @api.onchange('tool_material_status')
     def _onchange_tool_material_status(self):
diff --git a/sf_tool_management/wizard/wizard.py b/sf_tool_management/wizard/wizard.py
index 9e45b879..c7a039ec 100644
--- a/sf_tool_management/wizard/wizard.py
+++ b/sf_tool_management/wizard/wizard.py
@@ -225,8 +225,7 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
     # 整体式刀具型号
     integral_code_id = fields.Many2one('stock.lot', string='整体式刀具序列号',
                                        domain=[('product_id.cutting_tool_material_id.name', '=', '整体式刀具'),
-                                               ('quant_ids.location_id.name', 'in', ['刀具房']),
-                                               ('quant_ids.quantity', '>', 0)])
+                                               ('tool_material_status', '=', '可用')])
     cutting_tool_integral_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='整体式刀具型号',
                                                      related='integral_code_id.product_id.cutting_tool_model_id')
     integral_name = fields.Char('整体式刀具名称', related='integral_code_id.product_id.name')
@@ -238,8 +237,7 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
     # 刀片型号
     blade_code_id = fields.Many2one('stock.lot', '刀片序列号',
                                     domain=[('product_id.cutting_tool_material_id.name', '=', '刀片'),
-                                            ('quant_ids.location_id.name', 'in', ['刀具房']),
-                                            ('quant_ids.quantity', '>', 0)])
+                                            ('tool_material_status', '=', '可用')])
     cutting_tool_blade_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀片型号',
                                                   related='blade_code_id.product_id.cutting_tool_model_id')
     blade_name = fields.Char('刀片名称', related='blade_code_id.product_id.name')
@@ -250,8 +248,7 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
     # 刀杆型号
     bar_code_id = fields.Many2one('stock.lot', '刀杆序列号',
                                   domain=[('product_id.cutting_tool_material_id.name', '=', '刀杆'),
-                                          ('quant_ids.location_id.name', 'in', ['刀具房']),
-                                          ('quant_ids.quantity', '>', 0)])
+                                          ('tool_material_status', '=', '可用')])
     cutting_tool_cutterbar_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀杆型号',
                                                       related='bar_code_id.product_id.cutting_tool_model_id')
     bar_name = fields.Char('刀杆名称', related='bar_code_id.product_id.name')
@@ -262,8 +259,7 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
     # 刀盘型号
     pad_code_id = fields.Many2one('stock.lot', '刀盘序列号',
                                   domain=[('product_id.cutting_tool_material_id.name', '=', '刀盘'),
-                                          ('quant_ids.location_id.name', 'in', ['刀具房']),
-                                          ('quant_ids.quantity', '>', 0)])
+                                          ('tool_material_status', '=', '可用')])
     cutting_tool_cutterpad_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀盘型号',
                                                       related='pad_code_id.product_id.cutting_tool_model_id')
     pad_name = fields.Char('刀盘名称', related='pad_code_id.product_id.name')
@@ -274,8 +270,7 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
     # 刀柄型号
     handle_code_id = fields.Many2one('stock.lot', '刀柄序列号', required=True,
                                      domain=[('product_id.cutting_tool_material_id.name', '=', '刀柄'),
-                                             ('quant_ids.location_id.name', 'in', ['刀具房']),
-                                             ('quant_ids.quantity', '>', 0)])
+                                             ('tool_material_status', '=', '可用')])
     cutting_tool_cutterhandle_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀柄型号',
                                                          related='handle_code_id.product_id.cutting_tool_model_id')
     handle_name = fields.Char('刀柄名称', related='handle_code_id.product_id.name')
@@ -286,8 +281,7 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
     # 夹头型号
     chuck_code_id = fields.Many2one('stock.lot', '夹头序列号', required=True,
                                     domain=[('product_id.cutting_tool_material_id.name', '=', '夹头'),
-                                            ('quant_ids.location_id.name', 'in', ['刀具房']),
-                                            ('quant_ids.quantity', '>', 0)])
+                                            ('tool_material_status', '=', '可用')])
     cutting_tool_cutterhead_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='夹头型号',
                                                        related='chuck_code_id.product_id.cutting_tool_model_id')
     chuck_name = fields.Char('夹头名称', related='chuck_code_id.product_id.name')
@@ -753,7 +747,7 @@ class StockLot(models.Model):
             'qty_done': 1.0,
             'state': 'done',
             'functional_tool_type_id': False if not obj else obj.functional_tool_type_id.id,
-            'diameter':  None if not obj else obj.after_assembly_functional_tool_diameter,
+            'diameter': None if not obj else obj.after_assembly_functional_tool_diameter,
             'knife_tip_r_angle': None if not obj else obj.after_assembly_knife_tip_r_angle,
             'code': '' if not obj else obj.tool_code,
             'rfid': '' if not obj else obj.rfid,

From 952e663b31ee9806646869f0d0a9eee28594337d Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Tue, 19 Mar 2024 17:20:19 +0800
Subject: [PATCH 8/9] =?UTF-8?q?1=E3=80=81=E8=A7=A3=E5=86=B3=E5=88=80?=
 =?UTF-8?q?=E5=85=B7=E7=89=A9=E6=96=99=E9=87=87=E8=B4=AD=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90=E5=BA=8F=E5=88=97=E5=8F=B7?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=E9=97=AE=E9=A2=98=EF=BC=9B2=E3=80=81?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=88=80=E5=85=B7=E7=89=A9=E6=96=99=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E5=BA=8F=E5=88=97=E5=8F=B7=E6=97=B6=EF=BC=8C=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E6=9B=B4=E6=96=B0=E5=88=80=E5=85=B7=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=AE=B0=E5=BD=95=E7=9A=84=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/stock.py                    | 2 +-
 sf_tool_management/models/functional_tool_enroll.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sf_manufacturing/models/stock.py b/sf_manufacturing/models/stock.py
index c9c2ebf2..9cfcffc5 100644
--- a/sf_manufacturing/models/stock.py
+++ b/sf_manufacturing/models/stock.py
@@ -263,7 +263,7 @@ class ProductionLot(models.Model):
             if not last_serial:
                 return "%s-%s%03d" % (product.cutting_tool_model_id.code[:-12], now, 1)
             else:
-                return "%s-%s%03d" % (product.cutting_tool_model_id.code[:-12], now, int(last_serial.name[-3:]) + 1)
+                return "%s-%s%03d" % (product.cutting_tool_model_id.code[:-12], now, int(last_serial.name[-3:]) + 2)
         else:
             raise ValidationError('该刀具物料产品的型号字段为空，请补充完整！！！')
 
diff --git a/sf_tool_management/models/functional_tool_enroll.py b/sf_tool_management/models/functional_tool_enroll.py
index 1d954ed0..6c35f2ef 100644
--- a/sf_tool_management/models/functional_tool_enroll.py
+++ b/sf_tool_management/models/functional_tool_enroll.py
@@ -66,7 +66,7 @@ class StockLot(models.Model):
         records = super(StockLot, self).create(vals_list)
         for record in records:
             if record.product_id.categ_id.name == '刀具':
-                record.tool_material_status = '可用'
+                record.tool_material_status = '未入库'
                 record.enroll_tool_material_stock()
         return records
 

From a07563e166c05daac7003cfb055c12f2e23d7925 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Wed, 20 Mar 2024 16:34:11 +0800
Subject: [PATCH 9/9] =?UTF-8?q?1=E3=80=81=E6=96=B0=E5=A2=9E=E5=A4=B9?=
 =?UTF-8?q?=E5=85=B7=E7=89=A9=E6=96=99=E6=90=9C=E7=B4=A2=E6=A8=A1=E5=9E=8B?=
 =?UTF-8?q?=EF=BC=8C=E5=AE=8C=E6=88=90tree=E8=A7=86=E5=9B=BE=E5=92=8Cform?=
 =?UTF-8?q?=E8=A7=86=E5=9B=BE=EF=BC=9B2=E3=80=81=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=A4=B9=E5=85=B7=E7=89=A9=E6=96=99=E5=BA=8F=E5=88=97=E5=8F=B7?=
 =?UTF-8?q?=E3=80=81=E5=A4=B9=E5=85=B7=E7=89=A9=E6=96=99=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E6=B3=A8=E5=86=8C=E5=88=B0cloud=E7=9A=84?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=8C=E4=BC=98=E5=8C=96=E5=88=80=E5=85=B7?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E5=BA=8F=E5=88=97=E5=8F=B7=E6=B3=A8=E5=86=8C?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=8F=8A=E6=B5=81=E7=A8=8B=EF=BC=9B3?=
 =?UTF-8?q?=E3=80=81=E5=88=A0=E9=99=A4=E5=88=80=E5=85=B7=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=A8=A1=E5=9E=8B=E7=9A=84=E6=97=A0=E5=85=B3?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_tool_management/__manifest__.py            |   1 +
 sf_tool_management/models/__init__.py         |   2 +
 sf_tool_management/models/fixture_enroll.py   |  82 +++++
 .../models/fixture_material_search.py         |  55 ++++
 .../models/functional_tool_enroll.py          |  21 +-
 .../models/maintenance_equipment.py           |  44 ++-
 .../models/tool_material_search.py            | 304 ------------------
 .../security/ir.model.access.csv              |   2 +
 .../views/fixture_material_search_views.xml   | 105 ++++++
 .../views/tool_material_search.xml            |   1 -
 10 files changed, 278 insertions(+), 339 deletions(-)
 create mode 100644 sf_tool_management/models/fixture_enroll.py
 create mode 100644 sf_tool_management/models/fixture_material_search.py
 create mode 100644 sf_tool_management/views/fixture_material_search_views.xml

diff --git a/sf_tool_management/__manifest__.py b/sf_tool_management/__manifest__.py
index 3eee245a..a7750f69 100644
--- a/sf_tool_management/__manifest__.py
+++ b/sf_tool_management/__manifest__.py
@@ -20,6 +20,7 @@
         'views/sf_maintenance_equipment.xml',
         'views/menu_view.xml',
         'views/tool_material_search.xml',
+        'views/fixture_material_search_views.xml',
     ],
     'demo': [
     ],
diff --git a/sf_tool_management/models/__init__.py b/sf_tool_management/models/__init__.py
index 05637f26..f73f5e3d 100644
--- a/sf_tool_management/models/__init__.py
+++ b/sf_tool_management/models/__init__.py
@@ -3,4 +3,6 @@ from . import tool_material_search
 from . import maintenance_equipment
 from . import mrp_workorder
 from . import functional_tool_enroll
+from . import fixture_material_search
+from . import fixture_enroll
 
diff --git a/sf_tool_management/models/fixture_enroll.py b/sf_tool_management/models/fixture_enroll.py
new file mode 100644
index 00000000..24e4e9f5
--- /dev/null
+++ b/sf_tool_management/models/fixture_enroll.py
@@ -0,0 +1,82 @@
+import json
+import base64
+import requests
+from odoo import models, api
+from odoo.addons.sf_base.commons.common import Common
+from odoo.exceptions import UserError
+
+
+class StockLot(models.Model):
+    _inherit = 'stock.lot'
+    _description = '夹具物料序列号注册'
+
+    def enroll_fixture_material_stock(self):
+        sf_sync_config = self.env['res.config.settings'].get_values()
+        token = sf_sync_config['token']
+        sf_secret_key = sf_sync_config['sf_secret_key']
+        headers = Common.get_headers(self, token, sf_secret_key)
+        str_url = sf_sync_config['sf_url'] + "/api/fixture_material_stock/create"
+        objs_all = self.env['stock.lot'].search([('id', '=', self.id)])
+        fixture_material_stock_list = []
+        if objs_all:
+            for item in objs_all:
+                val = {
+                    'name': item.name,
+                    'tool_material_status': item.tool_material_status,
+                    'location': [] if not item.quant_ids else item.quant_ids[-1].location_id.name,
+                    'fixture_material_search_id': item.fixture_material_search_id.id,
+                }
+                fixture_material_stock_list.append(val)
+            kw = json.dumps(fixture_material_stock_list, ensure_ascii=False)
+            r = requests.post(str_url, json={}, data={'kw': kw, 'token': token}, headers=headers)
+            ret = r.json()
+            if ret.get('code') == 200:
+                return '夹具物料序列号注册成功'
+        else:
+            raise UserError("没有注册夹具物料序列号信息")
+
+
+class FixtureMaterialSearch(models.Model):
+    _inherit = 'sf.fixture.material.search'
+    _description = '夹具物料搜索注册'
+
+    crea_url = "/api/fixture_material/create"
+
+    def enroll_fixture_material(self):
+        sf_sync_config = self.env['res.config.settings'].get_values()
+        token = sf_sync_config['token']
+        sf_secret_key = sf_sync_config['sf_secret_key']
+        headers = Common.get_headers(self, token, sf_secret_key)
+        str_url = sf_sync_config['sf_url'] + self.crea_url
+        objs_all = self.search([('id', '=', self.id)])
+        fixture_material_list = []
+        if objs_all:
+            for obj in objs_all:
+                val = {
+                    'name': obj.name,
+                    'id': obj.id,
+                    'fixture_material_code': obj.fixture_material_id.code,
+                    'fixture_model_code': obj.fixture_model_id.code,
+                    'specification_name': obj.specification_fixture_id.name,
+                    'image': '' if not obj.image else base64.b64encode(obj.image).decode('utf-8'),
+                    'number': obj.number,
+                    'usable_num': obj.usable_num,
+                    'have_been_used_num': obj.have_been_used_num,
+                    'scrap_num': obj.scrap_num
+                }
+                fixture_material_list.append(val)
+            kw = json.dumps(fixture_material_list, ensure_ascii=False)
+            r = requests.post(str_url, json={}, data={'kw': kw, 'token': token}, headers=headers)
+            ret = r.json()
+            if ret.get('code') == 200:
+                return '夹具物料注册成功'
+        else:
+            raise UserError("没有注册夹具物料信息")
+
+    @api.model_create_multi
+    def create(self, vals_list):
+        records = super(FixtureMaterialSearch, self).create(vals_list)
+        for record in records:
+            if record:
+                record.enroll_fixture_material()
+        return records
diff --git a/sf_tool_management/models/fixture_material_search.py b/sf_tool_management/models/fixture_material_search.py
new file mode 100644
index 00000000..ea1212a9
--- /dev/null
+++ b/sf_tool_management/models/fixture_material_search.py
@@ -0,0 +1,55 @@
+from odoo import models, fields, api, SUPERUSER_ID
+
+
+class FixtureMaterialSearch(models.Model):
+    _name = 'sf.fixture.material.search'
+    _description = '夹具物料搜索'
+
+    product_id = fields.Many2one('product.product', string='夹具物料产品')
+
+    name = fields.Char('名称', related='product_id.name')
+    code = fields.Char('编码')
+    fixture_material_id = fields.Many2one('sf.fixture.material', '夹具物料',
+                                          related='product_id.fixture_material_id',
+                                          store=True,
+                                          group_expand='_read_group_fixture_material_id')
+    fixture_material_name = fields.Char('物料名称', related='product_id.fixture_material_id.name')
+    fixture_model_id = fields.Many2one('sf.fixture.model', '夹具型号',
+                                       related='product_id.fixture_model_id')
+    specification_fixture_id = fields.Many2one('sf.fixture.materials.basic.parameters', '规格',
+                                               related='product_id.specification_fixture_id')
+    image = fields.Binary('图片', related='product_id.image_1920')
+    number = fields.Integer('总数量', compute='_compute_number')
+    usable_num = fields.Integer('可用数量', compute='_compute_number')
+    have_been_used_num = fields.Integer('在用数量', compute='_compute_number')
+    scrap_num = fields.Integer('报废数量', compute='_compute_number')
+
+    barcode_ids = fields.One2many('stock.lot', 'fixture_material_search_id', string='序列号', readonly=True)
+
+    @api.depends('barcode_ids')
+    def _compute_number(self):
+        for record in self:
+            usable_num = 0
+            have_been_used_num = 0
+            scrap_num = 0
+            if record.barcode_ids:
+                record.number = len(record.barcode_ids)
+                for barcode_id in record.barcode_ids:
+                    if barcode_id.quant_ids:
+                        if barcode_id.quant_ids[-1].location_id.name not in '夹具房':
+                            have_been_used_num = have_been_used_num + 1
+                        else:
+                            usable_num = usable_num + 1
+                record.usable_num = usable_num
+                record.have_been_used_num = have_been_used_num
+                record.scrap_num = scrap_num
+            else:
+                record.number = 0
+                record.usable_num = 0
+                record.have_been_used_num = 0
+                record.scrap_num = 0
+
+    @api.model
+    def _read_group_fixture_material_id(self, categories, domain, order):
+        fixture_material_id = categories._search([], order=order, access_rights_uid=SUPERUSER_ID)
+        return categories.browse(fixture_material_id)
diff --git a/sf_tool_management/models/functional_tool_enroll.py b/sf_tool_management/models/functional_tool_enroll.py
index 6c35f2ef..c1687cde 100644
--- a/sf_tool_management/models/functional_tool_enroll.py
+++ b/sf_tool_management/models/functional_tool_enroll.py
@@ -34,14 +34,12 @@ class StockLot(models.Model):
     _inherit = 'stock.lot'
     _description = '刀具物料序列号注册'
 
-    crea_url = "/api/tool_material_stock/create"
-
     def enroll_tool_material_stock(self):
         sf_sync_config = self.env['res.config.settings'].get_values()
         token = sf_sync_config['token']
         sf_secret_key = sf_sync_config['sf_secret_key']
         headers = Common.get_headers(self, token, sf_secret_key)
-        str_url = sf_sync_config['sf_url'] + self.crea_url
+        str_url = sf_sync_config['sf_url'] + "/api/tool_material_stock/create"
         objs_all = self.env['stock.lot'].search([('id', '=', self.id)])
         tool_material_stock_list = []
         if objs_all:
@@ -61,15 +59,6 @@ class StockLot(models.Model):
         else:
             raise UserError("没有注册刀具物料序列号信息")
 
-    @api.model_create_multi
-    def create(self, vals_list):
-        records = super(StockLot, self).create(vals_list)
-        for record in records:
-            if record.product_id.categ_id.name == '刀具':
-                record.tool_material_status = '未入库'
-                record.enroll_tool_material_stock()
-        return records
-
 
 class ToolMaterial(models.Model):
     _inherit = 'sf.tool.material.search'
@@ -87,10 +76,6 @@ class ToolMaterial(models.Model):
         tool_material_list = []
         if objs_all:
             for item in objs_all:
-                barcode_names = []
-                for barcode_id in item.barcode_ids:
-                    if barcode_id.name:
-                        barcode_names.append(barcode_id.name)
                 val = {
                     'name': item.name,
                     'id': item.id,
@@ -101,9 +86,7 @@ class ToolMaterial(models.Model):
                     'number': item.number,
                     'usable_num': item.usable_num,
                     'have_been_used_num': item.have_been_used_num,
-                    'scrap_num': item.scrap_num,
-                    'barcode_names': str(barcode_names),
-                    'active': item.active
+                    'scrap_num': item.scrap_num
                 }
                 tool_material_list.append(val)
             kw = json.dumps(tool_material_list, ensure_ascii=False)
diff --git a/sf_tool_management/models/maintenance_equipment.py b/sf_tool_management/models/maintenance_equipment.py
index 5f2465bf..d39dc685 100644
--- a/sf_tool_management/models/maintenance_equipment.py
+++ b/sf_tool_management/models/maintenance_equipment.py
@@ -97,6 +97,7 @@ class StockLot(models.Model):
     _inherit = 'stock.lot'
 
     tool_material_search_id = fields.Many2one('sf.tool.material.search', string='刀具物料搜索')
+    fixture_material_search_id = fields.Many2one('sf.fixture.material.search', string='夹具物料搜索')
     tool_material_status = fields.Selection(
         [('未入库', '未入库'), ('可用', '可用'), ('在用', '在用'), ('报废', '报废')], string='状态',
         compute='_compute_tool_material_status', store=True)
@@ -105,20 +106,20 @@ class StockLot(models.Model):
     def _compute_tool_material_status(self):
         for record in self:
             if record:
-                if record.quant_ids:
-                    if record.quant_ids[-1].location_id.name == '刀具房':
-                        record.tool_material_status = '可用'
-                    elif record.quant_ids[-1].location_id.name == '刀具组装位置':
-                        record.tool_material_status = '在用'
-                    else:
-                        record.tool_material_status = '未入库'
-
-    @api.onchange('tool_material_status')
-    def _onchange_tool_material_status(self):
-        for obj in self:
-            if obj:
-                # 注册刀具物料状态到cloud平台
-                obj.enroll_tool_material_stock()
+                if record.product_id.categ_id.name in ['刀具', '夹具']:
+                    if record.quant_ids:
+                        if record.quant_ids[-1].location_id.name in ['刀具房', '夹具房']:
+                            record.tool_material_status = '可用'
+                        elif record.quant_ids[-1].location_id.name == '刀具组装位置':
+                            record.tool_material_status = '在用'
+                        else:
+                            record.tool_material_status = '未入库'
+                        if record.tool_material_search_id:
+                            # 注册刀具物料状态到cloud平台
+                            record.enroll_tool_material_stock()
+                        elif record.fixture_material_search_id:
+                            # 注册夹具物料状态到cloud平台
+                            record.enroll_fixture_material_stock()
 
     @api.model
     def name_search(self, name='', args=None, operator='ilike', limit=100):
@@ -149,7 +150,14 @@ class StockLot(models.Model):
                 tool_material_search = self.env['sf.tool.material.search'].sudo().search(
                     [('id', '=', record.product_id.tool_material_id)])
                 if tool_material_search:
-                    record.tool_material_search_id = tool_material_search
+                    record.tool_material_status = '未入库'
+                    record.tool_material_search_id = tool_material_search.id
+            elif record.product_id.categ_id.name == '夹具':
+                fixture_material_search = self.env['sf.fixture.material.search'].sudo().search(
+                    [('id', '=', record.product_id.fixture_material_search_id)])
+                if fixture_material_search:
+                    record.tool_material_status = '未入库'
+                    record.fixture_material_search_id = fixture_material_search.id
         return records
 
 
@@ -157,6 +165,7 @@ class ProductProduct(models.Model):
     _inherit = 'product.product'
 
     tool_material_id = fields.Char('刀具物料搜索模型ID')
+    fixture_material_search_id = fields.Char('夹具物料搜索模型ID')
 
     @api.model_create_multi
     def create(self, vals_list):
@@ -167,4 +176,9 @@ class ProductProduct(models.Model):
                     'product_id': record.id
                 })
                 record.tool_material_id = tool_material.id
+            elif record.categ_id.name == '夹具':
+                fixture_material = self.env['sf.fixture.material.search'].sudo().create({
+                    'product_id': record.id
+                })
+                record.fixture_material_search_id = fixture_material.id
         return records
diff --git a/sf_tool_management/models/tool_material_search.py b/sf_tool_management/models/tool_material_search.py
index 547bae32..75fc02e0 100644
--- a/sf_tool_management/models/tool_material_search.py
+++ b/sf_tool_management/models/tool_material_search.py
@@ -2,308 +2,6 @@
 from odoo import fields, models, api, SUPERUSER_ID
 
 
-# from odoo.exceptions import ValidationError
-
-
-# 刀具物料搜索（待删除）
-class SfToolMaterialSearch(models.Model):
-    _name = 'sf.tool.material.search'
-    _description = '刀具物料搜索'
-
-    sequence = fields.Integer('序号')
-    code = fields.Char('编码')
-    name = fields.Char('名称', required=True)
-    # 关联刀具类型
-    mrs_cutting_tool_type_id = fields.Many2one(
-        'sf.cutting.tool.type', '刀具类型',
-        domain="[('cutting_tool_material_id.name', '=', cutting_tool_material_name)]", required=True)
-    # 关联刀具物料名称
-    mrs_cutting_tool_material_name = fields.Char(related='mrs_cutting_tool_material_id.name', string='刀具物料名称',
-                                                 store=True)
-    cutting_tool_type = fields.Char(related='mrs_cutting_tool_material_id.name', string='刀具物料类型', store=True)
-    mrs_machine_brand_id = fields.Many2one('sf.machine.brand', '品牌', required=True,
-                                           domain="[('tag_ids.name', 'ilike', '刀具')]")
-    # 关联刀具型号
-    # mrs_cutting_tool_model_id = fields.Many2one('sf.cutting.tool.model', '刀具型号')
-
-    # 关联刀具物料模型
-    mrs_cutting_tool_material_id = fields.Many2one('sf.cutting.tool.material', '刀具物料',
-                                                   group_expand='_read_group_mrs_cutting_tool_material_ids',
-                                                   required=True)
-    cutting_tool_material_name = fields.Char(string='物料名称', invisible=True)
-
-    @api.onchange('mrs_cutting_tool_material_id')
-    def _onchange_mrs_cutting_tool_material_id(self):
-        for record in self:
-            if record:
-                record.cutting_tool_material_name = record.mrs_cutting_tool_material_id.name
-
-    @api.model
-    def _read_group_mrs_cutting_tool_material_ids(self, categories, domain, order):
-        mrs_cutting_tool_material_ids = categories._search([], order=order, access_rights_uid=SUPERUSER_ID)
-        return categories.browse(mrs_cutting_tool_material_ids)
-
-    # 刀片特有字段
-    blade_code = fields.Char('刀片编码', readonly=True)
-    blade_length = fields.Float('刀片长度L(mm)')
-    blade_width = fields.Float('刀片宽度D(mm)')
-    blade_height = fields.Float('刀片高度T(mm)')
-    blade_top_angle = fields.Float('刀片顶角(°)')
-    blade_front_angle = fields.Float('刀片前角(°)')
-    blade_rear_angle = fields.Float('刀片后角(°)')
-    blade_main_included_angle = fields.Float('刀片主偏角(°)')
-    blade_r_angle = fields.Float('刀片R角(°)')
-    blade_hardness = fields.Integer('刀片加工硬度')
-    blade_accuracy = fields.Char('刀片精度等级')
-    blade_coating_material_id = fields.Char('刀片涂层材质')
-    blade_radius = fields.Float('刀片刀尖半径(mm)')
-    blade_nut = fields.Float('刀片配对螺母(mm)')
-    mrs_cutting_tool_model_blade_cutter_bar_ids = fields.Many2many(
-        'sf.cutting_tool.standard.library',
-        relation='sf_tool_material_search_blade_cutter_bar_rel',
-        column1='model_id_1',
-        column2='model_id_2',
-        domain="[('cutting_tool_type', '=', '刀杆')]",
-        string='适用刀杆型号',
-        default=lambda self: [],  # 使用空列表作为默认值
-    )
-    mrs_cutting_tool_model_blade_cutter_pad_ids = fields.Many2many(
-        'sf.cutting_tool.standard.library',
-        relation='sf_tool_material_search_blade_cutter_pad_rel',
-        column1='model_id_1',
-        column2='model_id_2',
-        domain="[('cutting_tool_type', '=', '刀盘')]",
-        string='适用刀盘型号',
-        default=lambda self: [],  # 使用空列表作为默认值
-    )
-
-    # 整体式刀具特有字段
-    integral_code = fields.Char('整体式刀具编码', readonly=True)
-    integral_total_length = fields.Float('整体式刀具总长度(mm)', digits=(6, 1))
-    integral_shank_length = fields.Float('整体式刀具柄部长度(mm)', digits=(6, 1))
-    integral_blade_length = fields.Float('整体式刀具刃部长度(mm)', digits=(6, 1))
-    integral_neck_length = fields.Float('整体式刀具颈部长度(mm)', digits=(6, 1))
-    integral_shank_diameter = fields.Float('整体式刀具柄部直径(mm)', digits=(6, 1))
-    integral_blade_diameter = fields.Float('整体式刀具刃部直径(mm)', digits=(6, 1))
-    integral_neck_diameter = fields.Float('整体式刀具颈部直径(mm)', digits=(6, 1))
-    integral_blade_number = fields.Integer('整体式刀具刃数(个)')
-    integral_blade_tip_diameter = fields.Float('整体式刀具刀尖直径(mm)', digits=(6, 1))
-    integral_blade_tip_taper = fields.Float('整体式刀具刀尖锥度(°)', digits=(6, 1))
-    integral_blade_helix_angle = fields.Float('整体式刀具刃部螺旋角(°)', digits=(6, 1))
-    integral_blade_type = fields.Char('整体式刀具刃部类型')
-    integral_coarse_medium_fine = fields.Selection([('粗', '粗'), ('中', '中'), ('精', '精')], '整体式刀具粗/中/精')
-    # integral_blade_material = fields.Selection([('碳素钢', '碳素钢'), ('硬质合金', '硬质合金')], '整体式刀具刀具材质')
-    integral_hardness = fields.Integer('整体式刀具硬度(HRC)')
-    integral_coating_material = fields.Char('整体式刀具涂层材质')
-    integral_run_out_accuracy_max = fields.Float('整体式刀具端跳精度max', digits=(6, 1))
-    integral_run_out_accuracy_min = fields.Float('整体式刀具端跳精度min', digits=(6, 1))
-
-    suitable_machining_method_ids = fields.Many2many('maintenance.equipment.image',
-                                                     'rel_machining_product_template_material_search', '适合加工方式',
-                                                     domain=[('type', '=', '加工能力')])
-    blade_tip_characteristics_id = fields.Many2one('maintenance.equipment.image', '刀尖特征',
-                                                   domain=[('type', '=', '刀尖特征')])
-    handle_type_id = fields.Many2one('maintenance.equipment.image', '柄部类型', domain=[('type', '=', '柄部类型')])
-    cutting_direction_ids = fields.Many2many('maintenance.equipment.image',
-                                             'rel_cutting_product_template_material_search', '走刀方向',
-                                             domain=[('type', '=', '走刀方向')])
-    suitable_coolant_ids = fields.Many2many('maintenance.equipment.image',
-                                            'rel_coolants_product_template_material_search', '适合冷却方式',
-                                            domain=[('type', '=', '冷却方式')])
-
-    cutting_speed_ids = fields.Many2many('sf.cutting.speed', string='切削速度Vc')
-    feed_per_tooth_ids = fields.Many2many('sf.feed.per.tooth', 'rel_feed_per_tooth_ids', '每齿走刀量fz')
-
-    # @api.constrains('suitable_machining_method_ids')
-    # def _check_suitable_machining_method_ids(self):
-    #     for record in self:
-    #         if len(record.suitable_machining_method_ids) == 0 and self.cutting_tool_type == '整体式刀具':
-    #             raise ValidationError("适合加工方式不能为空!")
-    #
-    # @api.constrains('blade_tip_characteristics_ids')
-    # def _check_blade_tip_characteristics_ids(self):
-    #     for record in self:
-    #         if len(record.blade_tip_characteristics_ids) == 0 and self.cutting_tool_type == '整体式刀具':
-    #             raise ValidationError("刀尖特征不能为空!")
-    #         if len(record.blade_tip_characteristics_ids) > 1 and self.cutting_tool_type == '整体式刀具':
-    #             raise ValidationError("刀尖特征只能单选!")
-    #
-    # @api.constrains('handle_type_ids')
-    # def _check_handle_type_ids(self):
-    #     for record in self:
-    #         if len(record.handle_type_ids) == 0 and self.cutting_tool_type == '整体式刀具':
-    #             raise ValidationError("柄部类型不能为空!")
-    #         if len(record.handle_type_ids) > 1 and self.cutting_tool_type == '整体式刀具':
-    #             raise ValidationError("柄部类型只能单选!")
-    #
-    # @api.constrains('cutting_direction_ids')
-    # def _check_cutting_direction_ids(self):
-    #     for record in self:
-    #         if len(record.cutting_direction_ids) == 0 and self.cutting_tool_type == '整体式刀具':
-    #             raise ValidationError("走刀方向不能为空!")
-    #
-    # @api.constrains('suitable_coolant_ids')
-    # def _check_suitable_coolant_ids(self):
-    #     for record in self:
-    #         if not record.suitable_coolant_ids and self.cutting_tool_type == '整体式刀具':
-    #             raise ValidationError("适合冷却液不能为空!")
-    #
-    # @api.constrains('integral_total_length')
-    # def _check_integral_total_length(self):
-    #     if self.integral_total_length <= 0 and self.cutting_tool_type == '整体式刀具':
-    #         raise ValidationError("总长度不能为0")
-    #
-    # @api.constrains('integral_shank_length')
-    # def _check_integral_shank_length(self):
-    #     if self.integral_shank_length <= 0 and self.cutting_tool_type == '整体式刀具':
-    #         raise ValidationError("柄部长度不能为0")
-    #
-    # @api.constrains('integral_blade_length')
-    # def _check_integral_blade_length(self):
-    #     if self.integral_blade_length <= 0 and self.cutting_tool_type == '整体式刀具':
-    #         raise ValidationError("刃部长度不能为0")
-    #
-    # @api.constrains('integral_blade_number')
-    # def _check_integral_blade_number(self):
-    #     if self.integral_blade_number <= 0 and self.cutting_tool_type == '整体式刀具':
-    #         raise ValidationError("刃数不能为0")
-    #
-    # @api.constrains('integral_shank_diameter')
-    # def _check_integral_shank_diameter(self):
-    #     if self.integral_shank_diameter <= 0 and self.cutting_tool_type == '整体式刀具':
-    #         raise ValidationError("柄部直径不能为0")
-    #
-    # @api.constrains('integral_blade_diameter')
-    # def _check_integral_blade_diameter(self):
-    #     if self.integral_blade_diameter <= 0 and self.cutting_tool_type == '整体式刀具':
-    #         raise ValidationError("刃部直径不能为0")
-    #
-    # @api.constrains('integral_run_out_accuracy_min')
-    # def _check_integral_blade_diameter(self):
-    #     if self.integral_run_out_accuracy_min <= 0 and self.cutting_tool_type == '整体式刀具':
-    #         raise ValidationError("端跳精度最小(min)不能为0")
-    #
-    # @api.constrains('integral_run_out_accuracy_max')
-    # def _check_integral_run_out_accuracy_max(self):
-    #     if self.integral_run_out_accuracy_max <= 0 and self.cutting_tool_type == '整体式刀具':
-    #         raise ValidationError("端跳精度最大(max)不能为0")
-
-    # integral_front_angle = fields.Float('整体式刀具前角(°)')
-    # integral_rear_angle = fields.Float('整体式刀具后角(°)')
-    # integral_main_included_angle = fields.Float('整体式刀具主偏角(°)')
-    # integral_accuracy = fields.Float('整体式刀具精度等级')
-    # integral_hardness = fields.Float('整体式刀具加工硬度(HRC)')
-    # integral_coating_material = fields.Char('整体式刀具涂层材质')
-    # integral_nut = fields.Float('整体式刀具配对螺母(mm)')
-    # integral_scope = fields.Char('整体式刀具适用范围')
-
-    # 刀杆特有字段
-    bar_code = fields.Char('刀杆编码', readonly=True)
-    # bar_name = fields.Char('刀杆名称', required=True)
-    bar_c_diameter = fields.Float('刀杆C柄径(mm)')
-    bar_total_length = fields.Float('刀杆L总长(mm)')
-    bar_blade_number = fields.Integer('刀杆刃数')
-    bar_d_diameter = fields.Float('刀杆D刃径(mm)')
-    mrs_cutting_tool_model_bar_blade_ids = fields.Many2many(
-        'sf.cutting_tool.standard.library',
-        relation='sf_tool_material_search_bar_blade_rel',
-        column1='model_id_1',
-        column2='model_id_2',
-        domain="[('cutting_tool_type', '=', '刀片')]",
-        string='刀杆适用刀片型号'
-    )
-    bar_wrench = fields.Float('刀杆配对扳手(mm)')
-    bar_screw = fields.Float('刀杆配备螺丝(mm)')
-    bar_radius = fields.Float('刀杆刀尖圆角半径')
-    bar_accuracy = fields.Char('刀杆精度等级')
-    bar_hardness = fields.Integer('刀杆硬度(°)')
-    bar_scope = fields.Char('刀杆适用范围')
-
-    # 刀盘特有字段
-    pad_code = fields.Char('刀盘编码', readonly=True)
-    # pad_name = fields.Char('刀盘名称', required=True)
-    pad_c_diameter = fields.Float('刀盘C柄径(mm)')
-    pad_total_length = fields.Float('刀盘L总长(mm)')
-    pad_blade_number = fields.Integer('刀盘刃数')
-    pad_d_diameter = fields.Float('刀盘D刃径(mm)')
-    mrs_cutting_tool_model_pad_blade_ids = fields.Many2many(
-        'sf.cutting_tool.standard.library',
-        relation='sf_tool_material_search_pad_blade_rel',
-        column1='model_id_1',
-        column2='model_id_2',
-        domain="[('cutting_tool_type', '=', '刀片')]",
-        string='刀盘适用刀片型号'
-    )
-    pad_wrench = fields.Float('刀盘配对扳手(mm)')
-    pad_screw = fields.Float('刀盘配备螺丝(mm)')
-    pad_radius = fields.Float('刀盘刀尖圆角半径')
-    pad_accuracy = fields.Char('刀盘精度等级')
-    pad_hardness = fields.Integer('刀盘硬度(°)')
-    pad_scope = fields.Char('刀盘适用范围')
-
-    # 刀柄特有字段
-    handle_code = fields.Char('刀柄编码', readonly=True)
-    # 柄长L(mm)、法兰柄长L1(mm)、法兰直径D1(mm)
-    handle_length = fields.Float('刀柄柄长L(mm)')
-    handle_diameter = fields.Float('刀柄直径D(mm)')
-    handle_flange_length = fields.Float('刀柄法兰柄长L1(mm)')
-    handle_flange_diameter = fields.Float('刀柄法兰直径D1(mm)')
-    # 夹持直径min、夹持直径max、径跳精度、最大转速n/min、3D模型图
-    handle_clamping_diameter_min = fields.Float('刀柄夹持直径min')
-    handle_clamping_diameter_max = fields.Float('刀柄夹持直径max')
-    handle_jump_accuracy = fields.Float('刀柄径跳精度')
-    handle_max_speed = fields.Float('刀柄最大转速n/min')
-    handle_weight = fields.Float('刀柄重量(kg)')
-    handle_body_accuracy = fields.Float('刀柄本体精度(mm)')
-    handle_nut = fields.Float('刀柄配对螺母(mm)')
-    mrs_cutting_tool_model_handle_chuck_model_ids = fields.Many2many(
-        'sf.cutting_tool.standard.library',
-        relation='sf_tool_material_search_handle_chuck_rel',
-        column1='model_id_1',
-        column2='model_id_2',
-        domain="[('cutting_tool_type', '=', '夹头')]",
-        string='适用夹头型号'
-    )
-    handle_clamping_range = fields.Float('刀柄夹持范围(mm)')
-    handle_detection_accuracy = fields.Float('刀柄检测精度')
-    handle_detection_hardness = fields.Integer('刀柄检测硬度')
-    handle_standard_speed = fields.Float('刀柄标准转速')
-
-    # 夹头特有字段
-    chuck_code = fields.Char('夹头编码', readonly=True)
-    # chuck_name = fields.Char('夹头名称', required=True)
-    chuck_accuracy = fields.Float('夹头精度(mm)')
-    # 夹持直径min、夹持直径max、3D模型图
-    chuck_clamping_diameter_min = fields.Float('夹头夹持直径min(mm)')
-    chuck_clamping_diameter_max = fields.Float('夹头夹持直径max(mm)')
-    chuck_diameter = fields.Float('夹头外径(mm)')
-    chuck_inner_diameter = fields.Float('夹头内径(mm)')
-    chuck_height = fields.Float('夹头高度(mm)')
-    chuck_nut = fields.Float('夹头配对螺母(mm)')
-    mrs_cutting_tool_model_chuck_handle_model_ids = fields.Many2many(
-        'sf.cutting_tool.standard.library',
-        relation='sf_tool_material_search_chuck_handle_rel',
-        column1='model_id_1',
-        column2='model_id_2',
-        domain="[('cutting_tool_type', '=', '刀柄')]",
-        string='适用刀柄型号'
-    )
-    chuck_clamping_range = fields.Float('夹头夹持范围(mm)')
-    chuck_feature = fields.Char('夹头特性')
-    image = fields.Binary('夹头图片')
-
-    # 数量、采购入库日期、采购批次、供应商、仓库名称、库区、库位、3D模型
-    number = fields.Integer('数量')
-    mrs_materials_model_id = fields.Many2one('sf.materials.model', '材料型号')
-    purchase_date = fields.Date('采购入库日期')
-    purchase_batch = fields.Char('采购批次')
-    supplier = fields.Char('供应商')
-    warehouse_name = fields.Char('仓库名称')
-    warehouse_area = fields.Char('库区')
-    warehouse_location = fields.Char('库位')
-    three_d_model = fields.Many2one('ir.attachment', '3D模型')
-
-
 class ToolMaterial(models.Model):
     _name = 'sf.tool.material.search'
     _description = '刀具物料搜索'
@@ -329,8 +27,6 @@ class ToolMaterial(models.Model):
 
     barcode_ids = fields.One2many('stock.lot', 'tool_material_search_id', string='序列号', readonly=True)
 
-    active = fields.Boolean(string='已归档', default=True)
-
     @api.depends('barcode_ids')
     def _compute_number(self):
         for record in self:
diff --git a/sf_tool_management/security/ir.model.access.csv b/sf_tool_management/security/ir.model.access.csv
index 6df54c0b..35217493 100644
--- a/sf_tool_management/security/ir.model.access.csv
+++ b/sf_tool_management/security/ir.model.access.csv
@@ -13,6 +13,7 @@ access_sf_tool_transfer_request_information,sf.tool.transfer.request.information
 access_sf_functional_tool_assembly,sf.functional.tool.assembly,model_sf_functional_tool_assembly,sf_base.group_sf_tool_user,1,1,1,0
 access_sf_functional_tool_assembly_order,sf.functional.tool.assembly.order,model_sf_functional_tool_assembly_order,sf_base.group_sf_tool_user,1,1,1,0
 access_sf_tool_material_search,sf.tool.material.search,model_sf_tool_material_search,sf_base.group_sf_tool_user,1,1,1,0
+access_sf_fixture_material_search,sf.fixture.material.search,model_sf_fixture_material_search,sf_base.group_sf_tool_user,1,1,1,0
 
 
 access_sf_functional_cutting_tool_entity_group_plan_dispatch,sf.functional.cutting.tool.entity,model_sf_functional_cutting_tool_entity,sf_base.group_plan_dispatch,1,0,0,0
@@ -29,3 +30,4 @@ access_sf_tool_transfer_request_information_group_plan_dispatch,sf.tool.transfer
 access_sf_functional_tool_assembly_group_plan_dispatch,sf.functional.tool.assembly,model_sf_functional_tool_assembly,sf_base.group_plan_dispatch,1,0,0,0
 access_sf_functional_tool_assembly_order_group_plan_dispatch,sf.functional.tool.assembly.order,model_sf_functional_tool_assembly_order,sf_base.group_plan_dispatch,1,0,0,0
 access_sf_tool_material_search_group_plan_dispatch,sf.tool.material.search,model_sf_tool_material_search,sf_base.group_plan_dispatch,1,0,0,0
+access_sf_fixture_material_search_group_plan_dispatch,sf.fixture.material.search,model_sf_fixture_material_search,sf_base.group_plan_dispatch,1,0,0,0
diff --git a/sf_tool_management/views/fixture_material_search_views.xml b/sf_tool_management/views/fixture_material_search_views.xml
new file mode 100644
index 00000000..f70eba36
--- /dev/null
+++ b/sf_tool_management/views/fixture_material_search_views.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="sf_fixture_material_search_tree" model="ir.ui.view">
+        <field name="name">sf.fixture.material.search.tree</field>
+        <field name="model">sf.fixture.material.search</field>
+        <field name="arch" type="xml">
+            <tree string="夹具物料查询" create="0">
+                <field name="name"/>
+                <field name="fixture_material_id"/>
+                <field name="fixture_model_id"/>
+                <field name="specification_fixture_id"/>
+                <field name="number"/>
+                <field name="usable_num"/>
+                <field name="image" type="image"/>
+            </tree>
+        </field>
+    </record>
+
+
+    <record id="sf_fixture_material_search_form" model="ir.ui.view">
+        <field name="name">sf.fixture.material.search.form</field>
+        <field name="model">sf.fixture.material.search</field>
+        <field name="arch" type="xml">
+            <form string="夹具物料查询" create="0">
+<!--                <header>-->
+<!--                    <button string="夹具物料注册" name="enroll_fixture_material" type="object" class="btn-primary"/>-->
+<!--                </header>-->
+                <sheet>
+                    <div class="oe_title">
+                        <h1>
+                            <field name="product_id" readonly="1"/>
+                        </h1>
+                    </div>
+                    <group>
+                        <group>
+                            <field name="name" invisible="1"/>
+                            <field name="fixture_material_id"/>
+                            <field name="fixture_model_id"/>
+                            <field name="specification_fixture_id"/>
+                            <field name="number"/>
+                        </group>
+                        <group>
+                            <field name="image" type="image"/>
+                        </group>
+                    </group>
+                    <group>
+                        <group col="3">
+                            <group>
+                                <field name="usable_num"/>
+                            </group>
+                            <group>
+                                <field name="have_been_used_num"/>
+                            </group>
+                            <group>
+                                <field name="scrap_num"/>
+                            </group>
+                        </group>
+                    </group>
+                    <notebook>
+                        <page string="序列号">
+                            <field name="barcode_ids">
+                                <tree create="0">
+                                    <field name="name"/>
+                                    <field name="tool_material_status"/>
+<!--                                    <button string="序列号注册" name="enroll_fixture_material_stock" type="object"-->
+<!--                                            class="btn-primary"/>-->
+                                </tree>
+                            </field>
+                        </page>
+                    </notebook>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="sf_fixture_material_search_search" model="ir.ui.view">
+        <field name="name">sf.fixture.material.search.search</field>
+        <field name="model">sf.fixture.material.search</field>
+        <field name="arch" type="xml">
+            <search string="夹具物料搜索">
+                <field name="name" string="名称搜索" filter_domain="[('name','ilike',self)]"/>
+                <field name="fixture_material_id" string="夹具型号搜索"/>
+                <field name="specification_fixture_id" string="规格搜索"/>
+                <searchpanel>
+                    <field name="fixture_material_id" icon="fa-building" enable_counters="1"/>
+                </searchpanel>
+            </search>
+        </field>
+    </record>
+
+    <record id="action_sf_fixture_material_search" model="ir.actions.act_window">
+        <field name="name">夹具物料查询</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">sf.fixture.material.search</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <menuitem
+            sequence="25"
+            name="夹具物料查询"
+            id="menu_sf_fixture_material_search"
+            action="action_sf_fixture_material_search"
+            parent="menu_sf_tool_manage"
+    />
+</odoo>
\ No newline at end of file
diff --git a/sf_tool_management/views/tool_material_search.xml b/sf_tool_management/views/tool_material_search.xml
index fe08da42..3f3c91a2 100644
--- a/sf_tool_management/views/tool_material_search.xml
+++ b/sf_tool_management/views/tool_material_search.xml
@@ -82,7 +82,6 @@
                     <field name="name" string="名称搜索" filter_domain="[('name','ilike',self)]"/>
                     <field name="cutting_tool_standard_library_id" string="刀具型号搜索"/>
                     <field name="specification_id" string="规格搜索"/>
-                    <filter string="已归档" name="inactive" domain="[('active', '=', False)]"/>
                     <searchpanel>
                         <field name="cutting_tool_material_id" icon="fa-building" enable_counters="1"/>
                     </searchpanel>