1、优化组装流程；2、添加权限

sf_tool_management/models/functional_tool.py

@@ -11,6 +11,7 @@ class FunctionalCuttingToolEntity(models.Model):
     _description = '功能刀具列表'
 
     functional_tool_name_id = fields.Many2one('sf.functional.tool.assembly', string='功能刀具组装单', readonly=True)
+
     tool_groups_id = fields.Many2one('sf.tool.groups', '刀具组', related='functional_tool_name_id.tool_groups_id')
     code = fields.Char('编码')
     rfid = fields.Char('Rfid', readonly=True)
@@ -469,10 +470,7 @@ class RealTimeDistributionOfFunctionalTools(models.Model):
         """
         # 根据功能刀具名称、刀具组、直径或尖刀R角、粗/中/精查询该功能刀具是否已经存在
         record = self.env['sf.real.time.distribution.of.functional.tools'].search(
-            [('functional_name_id', '=', vals['functional_name_id']),
+            [('functional_name_id', '=', vals['functional_name_id'])])
-             ('sf_cutting_tool_type_id', '=', vals['sf_cutting_tool_type_id']),
-             ('diameter', '=', vals['diameter']), ('knife_tip_r_angle', '=', vals['knife_tip_r_angle']),
-             ('coarse_middle_thin', '=', vals['coarse_middle_thin']), ('tool_groups_id', '=', vals['tool_groups_id'])])
         if len(record) > 0:
             for obj in record:
                 obj.write({'sf_functional_cutting_tool_entity_ids': [(4, sf_functional_cutting_tool_entity_ids.id)]})

sf_tool_management/security/ir.model.access.csv

@@ -1,4 +1,5 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_sf_functional_cutting_tool_entity,sf.functional.cutting.tool.entity,model_sf_functional_cutting_tool_entity,base.group_user,1,1,1,0
 access_sf_functional_cutting_tool_entity,sf.functional.cutting.tool.entity,model_sf_functional_cutting_tool_entity,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
 access_sf_functional_cutting_tool_entity_group_sf_order_user,sf.functional.cutting.tool.entity,model_sf_functional_cutting_tool_entity,sf_base.group_sf_order_user,1,0,0,0
@@ -21,9 +22,9 @@ access_sf_tool_change_requirement_information_group_plan_dispatch,sf.tool.change
 access_sf_tool_transfer_request_information,sf.tool.transfer.request.information,model_sf_tool_transfer_request_information,sf_base.group_sf_tool_user,1,1,1,0
 access_sf_tool_transfer_request_information_group_plan_dispatch,sf.tool.transfer.request.information,model_sf_tool_transfer_request_information,sf_base.group_plan_dispatch,1,0,0,0
 
-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_group_sf_tool_user,sf.functional.tool.assembly_group_sf_tool_user,model_sf_functional_tool_assembly,sf_base.group_sf_tool_user,1,1,1,0
+access_sf_functional_tool_assembly_group_user,sf.functional.tool.assembly_group_user,model_sf_functional_tool_assembly,base.group_user,1,0,0,0
 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,sf.functional.tool.assembly.order,model_sf_functional_tool_assembly_order,sf_base.group_sf_tool_user,1,1,1,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
 
@@ -34,5 +35,6 @@ access_sf_fixture_material_search,sf.fixture.material.search,model_sf_fixture_ma
 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
 
 
-access_sf_functional_tool_dismantle_group_sf_tool_user,sf.functional.tool.dismantle,model_sf_functional_tool_dismantle,sf_base.group_sf_tool_user,1,1,1,0
+access_sf_functional_tool_dismantle,sf.functional.tool.dismantle,model_sf_functional_tool_dismantle,base.group_user,1,1,1,0
-access_sf_functional_tool_dismantle_group_plan_dispatch,sf.functional.tool.dismantle,model_sf_functional_tool_dismantle,sf_base.group_plan_dispatch,1,0,0,0
+access_sf_functional_tool_dismantle_group_sf_tool_user,sf.functional.tool.dismantle_group_sf_tool_user,model_sf_functional_tool_dismantle,sf_base.group_sf_tool_user,1,1,1,0
+access_sf_functional_tool_dismantle_group_plan_dispatch,sf.functional.tool.dismantle_group_plan_dispatch,model_sf_functional_tool_dismantle,sf_base.group_plan_dispatch,1,0,0,0

sf_tool_management/views/functional_tool_views.xml

@@ -400,6 +400,9 @@
                                     </tree>
                                 </field>
                             </page>
+                            <page string="组装单">
+                                <field name="sf_functional_tool_assembly_ids" domain="[('assemble_status', '=', 0)]"/>
+                            </page>
                         </notebook>
                     </sheet>
                 </form>

sf_tool_management/wizard/wizard.py

@@ -634,12 +634,7 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
         record_1 = self.env['sf.functional.cutting.tool.entity'].create(desc_2)
         # 创建安全库存信息
         self.env['sf.real.time.distribution.of.functional.tools'].create_or_edit_safety_stock({
-            'functional_name_id': self.after_name_id.id,
+            'functional_name_id': self.after_name_id.id
-            'sf_cutting_tool_type_id': self.after_assembly_functional_tool_type_id.id,
-            'tool_groups_id': self.after_tool_groups_id.id,
-            'diameter': self.after_assembly_functional_tool_diameter,
-            'knife_tip_r_angle': self.after_assembly_knife_tip_r_angle,
-            'coarse_middle_thin': self.after_assembly_coarse_middle_thin,
         }, record_1)
 
         # =====================修改功能刀具组装单、机床换刀申请、CAM工单程序用刀计划的状态==============
@@ -820,7 +815,7 @@ class ProductProduct(models.Model):
         stock_location_id = self.env['stock.location'].search([('name', '=', '组装后')])
         # 创建功能刀具该批次/序列号  库存移动和移动历史
         stock_lot.create_stock_quant(location_inventory_id, stock_location_id, functional_tool_assembly.id,
-                                     self.assembly_order_code, obj, obj.after_tool_groups_id)
+                                     obj.assembly_order_code, obj, obj.after_tool_groups_id)
 
         return stock_lot