Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化

# Conflicts:
#	sf_sale/security/ir.model.access.csv

sf_base/models/basic_parameters_fixture.py

@@ -59,7 +59,7 @@ class BasicParametersFixture(models.Model):
     magnetic_field_height = fields.Float('磁场高度(mm)', digits=(16, 2))
     magnetic_pole_plate_grinding_allowance = fields.Float('磁极板磨削余量(mm)', digits=(16, 2))
 
-    # '转接板夹具' 字段
+    # '转接板(锁板)夹具' 字段
     screw_size = fields.Float('螺牙大小(mm)', digits=(16, 2))
     via_hole_diameter = fields.Float('过孔直径(mm)', digits=(16, 2))
 

sf_base/models/fixture.py

@@ -45,7 +45,7 @@ class FixtureModel(models.Model):
     magnet_fixture_ids = fields.One2many('sf.fixture.materials.basic.parameters', 'fixture_model_id',
                                          string='磁吸夹具基本参数')
     adapter_board_fixture_ids = fields.One2many('sf.fixture.materials.basic.parameters', 'fixture_model_id',
-                                                string='转接板夹具基本参数')
+                                                string='转接板(锁板)夹具基本参数')
     scroll_chuck_ids = fields.One2many('sf.fixture.materials.basic.parameters', 'fixture_model_id',
                                        string='三爪卡盘基本参数')
 
@@ -67,7 +67,7 @@ class FixtureModel(models.Model):
         if fixture_material_id:
             if self.fixture_material_id.name == "气动夹具":
                 code = self._get_code("JKM-C-JJWL-QDJJ-")
-            elif self.fixture_material_id.name == "转接板夹具":
+            elif self.fixture_material_id.name == "转接板(锁板)夹具":
                 code = self._get_code("JKM-C-JJWL-ZJJJ-")
             elif self.fixture_material_id.name == "磁吸夹具":
                 code = self._get_code("JKM-C-JJWL-CXJJ-")

sf_base/views/fixture_view.xml

@@ -341,7 +341,7 @@
                                 </tree>
                             </field>
                             <field name="adapter_board_fixture_ids"
-                                   attrs="{'invisible': [('fixture_material_type', '!=', '转接板夹具')]}">
+                                   attrs="{'invisible': [('fixture_material_type', '!=', '转接板(锁板)夹具')]}">
                                 <tree editable="bottom" class="center" delete="0">
                                     <field name="name"/>
                                     <field name="length"/>