From d1c10f56d1bea67dd82c69c3651efcc7e7de344b Mon Sep 17 00:00:00 2001 From: yuxianghui <3437689193@qq.com> Date: Fri, 5 Jan 2024 17:33:06 +0800 Subject: [PATCH 01/14] =?UTF-8?q?1=E3=80=81sf=5Fbase=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=88=80=E5=85=B7=E7=BB=84=E6=A8=A1=E5=9E=8B=EF=BC=9B2?= =?UTF-8?q?=E3=80=81=E6=89=80=E4=BB=A5=E5=8A=9F=E8=83=BD=E5=88=80=E5=85=B7?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=A8=A1=E5=9E=8B=E6=B7=BB=E5=8A=A0=E5=88=80?= =?UTF-8?q?=E5=85=B7=E7=BB=84=E5=AF=B9=E8=B1=A1=E5=AD=97=E6=AE=B5=EF=BC=88?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E4=B8=AD=EF=BC=89=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_base/models/tool_base_new.py | 9 +++++++++ sf_base/security/ir.model.access.csv | 1 + sf_base/views/tool_menu.xml | 7 +++++++ sf_base/views/tool_views.xml | 22 ++++++++++++++++++++++ sf_tool_management/models/base.py | 10 +++++++++- 5 files changed, 48 insertions(+), 1 deletion(-) diff --git a/sf_base/models/tool_base_new.py b/sf_base/models/tool_base_new.py index 4dc6b619..3d6504ab 100644 --- a/sf_base/models/tool_base_new.py +++ b/sf_base/models/tool_base_new.py @@ -238,3 +238,12 @@ class MaintenanceStandardImage(models.Model): else: record['image'] = "" return records + + +class ToolGroups(models.Model): + _name = 'sf.tool.groups' + _description = '刀具组' + + name = fields.Char('名称') + equipment_ids = fields.Many2many('maintenance.equipment', 'ref_maintenance_equipment', string='机台号') + remark = fields.Char('备注', size=50) diff --git a/sf_base/security/ir.model.access.csv b/sf_base/security/ir.model.access.csv index 77c3e810..1490b9ef 100644 --- a/sf_base/security/ir.model.access.csv +++ b/sf_base/security/ir.model.access.csv @@ -28,6 +28,7 @@ access_sf_sync_common,sf_sync_common,model_sf_sync_common,base.group_user,1,1,1, access_sf_international_standards,sf_international_standards,model_sf_international_standards,base.group_user,1,1,1,1 access_material_apply,material_apply,model_material_apply,base.group_user,1,1,1,1 access_sf_cutting_tool_standard_library,sf_cutting_tool_standard_library,model_sf_cutting_tool_standard_library,base.group_user,1,1,1,1 +access_sf_tool_groups,sf_tool_groups,model_sf_tool_groups,base.group_user,1,1,1,1 access_sf_tool_materials_basic_parameters,sf_tool_materials_basic_parameters,model_sf_tool_materials_basic_parameters,base.group_user,1,1,1,1 access_sf_cutting_speed,sf_cutting_speed,model_sf_cutting_speed,base.group_user,1,1,1,1 access_sf_feed_per_tooth,sf_feed_per_tooth,model_sf_feed_per_tooth,base.group_user,1,1,1,1 diff --git a/sf_base/views/tool_menu.xml b/sf_base/views/tool_menu.xml index cddb7d90..82ecca18 100644 --- a/sf_base/views/tool_menu.xml +++ b/sf_base/views/tool_menu.xml @@ -92,5 +92,12 @@ action="action_maintenance_equipment_image" sequence="5"/> + + diff --git a/sf_base/views/tool_views.xml b/sf_base/views/tool_views.xml index f189017d..d300f845 100644 --- a/sf_base/views/tool_views.xml +++ b/sf_base/views/tool_views.xml @@ -493,6 +493,28 @@ [] + + + 刀具组 + sf.tool.groups + + + + + + + + + + + + + 刀具组 + ir.actions.act_window + sf.tool.groups + tree,form,search + + diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py index 80ac3811..d64b8ee1 100644 --- a/sf_tool_management/models/base.py +++ b/sf_tool_management/models/base.py @@ -10,7 +10,8 @@ class FunctionalCuttingToolEntity(models.Model): _name = 'sf.functional.cutting.tool.entity' _description = '功能刀具列表' - # code = fields.Char('序列号') + code = fields.Char('编码', related='functional_tool_name_id.code') + tool_groups_id = fields.Many2one('sf.tool.groups', '刀具组', related='functional_tool_name_id.tool_groups_id') name = fields.Char(related='functional_tool_name_id.name') functional_tool_name_id = fields.Many2one('sf.functional.tool.assembly', string='功能刀具名称', readonly=True) barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号', readonly=True) @@ -175,6 +176,8 @@ class FunctionalToolWarning(models.Model): _name = 'sf.functional.tool.warning' _description = '功能刀具预警' + code = fields.Char('编码', related='functional_tool_name_id.code') + tool_groups_id = fields.Many2one('sf.tool.groups', '刀具组', related='functional_tool_name_id.tool_groups_id') name = fields.Char('名称', invisible=True, readonly=True, related='functional_tool_name_id.name') # 机床信息 production_line_id = fields.Many2one('sf.production.line', string='生产线', @@ -243,6 +246,8 @@ class StockMoveLine(models.Model): diameter = fields.Integer(string='刀具直径(mm)', related='functional_tool_name_id.functional_tool_diameter') knife_tip_r_angle = fields.Float(string='刀尖R角(mm)', related='functional_tool_name_id.knife_tip_r_angle') install_tool_time = fields.Datetime("刀具组装时间", related='functional_tool_name_id.tool_loading_time') + code = fields.Char('编码', related='functional_tool_name_id.code') + tool_groups_id = fields.Many2one('sf.tool.groups', '刀具组', related='functional_tool_name_id.tool_groups_id') @api.model def _read_group_functional_tool_type_id(self, categories, domain, order): @@ -255,6 +260,7 @@ class RealTimeDistributionOfFunctionalTools(models.Model): _description = '功能刀具安全库存' name = fields.Char('功能刀具名称', readonly=False) + tool_groups_id = fields.Many2one('sf.tool.groups', '刀具组') sf_cutting_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=False, group_expand='_read_mrs_cutting_tool_type_ids', store=True) diameter = fields.Integer(string='刀具直径(mm)', readonly=False) @@ -421,6 +427,8 @@ class MachineTableToolChangingApply(models.Model): cutter_spacing_code_id = fields.Many2one('maintenance.equipment.tool', string='刀位号', readonly=True, required=True, domain="[('equipment_id', '=', maintenance_equipment_id)]") # 功能刀具信息 + code = fields.Char('编码', related='functional_tool_name_id.code') + tool_groups_id = fields.Many2one('sf.tool.groups', '刀具组', related='functional_tool_name_id.tool_groups_id') functional_tool_name = fields.Char(string='刀具名称', related='functional_tool_name_id.name', store=True) barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号', store=True, domain=[('product_id.name', '=', '功能刀具')], From ce53afe1b09f96a4f477d7de3ff18439805bf27d Mon Sep 17 00:00:00 2001 From: "qihao.gong@jikimo.com" Date: Mon, 8 Jan 2024 15:29:48 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9D=83=E9=99=90?= =?UTF-8?q?=E7=BB=84=E8=AE=BF=E9=97=AE=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_maintenance/security/ir.model.access.csv | 17 +++++++++++------ sf_maintenance/views/maintenance_views.xml | 2 +- sf_manufacturing/security/ir.model.access.csv | 7 ++++--- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/sf_maintenance/security/ir.model.access.csv b/sf_maintenance/security/ir.model.access.csv index 4f693af2..d772d54c 100644 --- a/sf_maintenance/security/ir.model.access.csv +++ b/sf_maintenance/security/ir.model.access.csv @@ -1,10 +1,15 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -access_equipment_maintenance_standards,equipment_maintenance_standards,model_equipment_maintenance_standards,sf_group_equipment_user,1,1,1,1 -access_sf_maintenance_logs,sf_maintenance_logs,model_sf_maintenance_logs,sf_group_equipment_user,1,1,1,1 -access_maintenance_equipment,maintenance_equipment,model_maintenance_equipment,sf_group_equipment_user,1,1,1,1 -access_maintenance_standards,maintenance_standards,model_maintenance_standards,sf_group_equipment_user,1,1,1,1 -access_maintenance_standard_image,maintenance_standard_image,model_maintenance_standard_image,sf_group_equipment_user,1,1,1,1 -access_sf_robot_axis_num,sf_robot_axis_num,model_sf_robot_axis_num,sf_group_equipment_user,1,1,1,1 +access_equipment_maintenance_standards,equipment_maintenance_standards,model_equipment_maintenance_standards,sf_group_equipment_user,1,1,1,0 +access_sf_maintenance_logs,sf_maintenance_logs,model_sf_maintenance_logs,sf_group_equipment_user,1,0,0,0 +access_sf_maintenance_logs,sf_maintenance_logs,model_sf_maintenance_logs,sf_group_equipment_manager,1,1,1,0 +access_maintenance_equipment,maintenance_equipment,model_maintenance_equipment,sf_group_equipment_user,1,0,0,0 +access_maintenance_equipment,maintenance_equipment,model_maintenance_equipment,sf_group_equipment_manager,1,1,1,0 +access_maintenance_standards,maintenance_standards,model_maintenance_standards,sf_group_equipment_user,1,0,0,0 +access_maintenance_standards,maintenance_standards,model_maintenance_standards,sf_group_equipment_manager,1,1,1,0 +access_maintenance_standard_image,maintenance_standard_image,model_maintenance_standard_image,sf_group_equipment_user,1,0,0,0 +access_maintenance_standard_image,maintenance_standard_image,model_maintenance_standard_image,sf_group_equipment_manager,1,1,1,0 +access_sf_robot_axis_num,sf_robot_axis_num,model_sf_robot_axis_num,sf_group_equipment_user,1,0,0,0 +access_sf_robot_axis_num,sf_robot_axis_num,model_sf_robot_axis_num,sf_group_equipment_manager,1,1,1,0 access_maintenance_request,maintenance.request,maintenance.model_maintenance_request,sf_base.group_plan_dispatch,1,0,0,0 diff --git a/sf_maintenance/views/maintenance_views.xml b/sf_maintenance/views/maintenance_views.xml index 5266bced..0dc18355 100644 --- a/sf_maintenance/views/maintenance_views.xml +++ b/sf_maintenance/views/maintenance_views.xml @@ -48,7 +48,7 @@ - + diff --git a/sf_manufacturing/security/ir.model.access.csv b/sf_manufacturing/security/ir.model.access.csv index 313c4567..d71f7f4b 100644 --- a/sf_manufacturing/security/ir.model.access.csv +++ b/sf_manufacturing/security/ir.model.access.csv @@ -6,10 +6,10 @@ access_sf_model_type_manager,sf_model_type,model_sf_model_type,sf_base.group_sf_ access_sf_product_model_type_routing_sort,sf_product_model_type_routing_sort,model_sf_product_model_type_routing_sort,sf_base.group_sf_mrp_user,1,0,0,0 access_sf_product_model_type_routing_sort_manager,sf_product_model_type_routing_sort,model_sf_product_model_type_routing_sort,sf_base.group_sf_mrp_manager,1,1,1,0 access_sf_embryo_model_type_routing_sort,sf_embryo_model_type_routing_sort,model_sf_embryo_model_type_routing_sort,sf_base.group_sf_mrp_user,1,0,0,0 -access_sf_embryo_model_type_routing_sort_manager,sf_embryo_model_type_routing_sort,model_sf_embryo_model_type_routing_sort,sf_base.group_sf_mrp_manager,1,1,1,1 +access_sf_embryo_model_type_routing_sort_manager,sf_embryo_model_type_routing_sort,model_sf_embryo_model_type_routing_sort,sf_base.group_sf_mrp_manager,1,1,1,0 access_sf_surface_technics_model_type_routing_sort,sf_surface_technics_model_type_routing_sort,model_sf_surface_technics_model_type_routing_sort,sf_base.group_sf_mrp_user,1,0,0,0 access_sf_surface_technics_model_type_routing_sort_manager,sf_surface_technics_model_type_routing_sort,model_sf_surface_technics_model_type_routing_sort,sf_base.group_sf_mrp_manager,1,1,1,0 -access_sf_production_line,sf.production.line,model_sf_production_line,sf_base.group_sf_mrp_user,1,0,0,0 +access_sf_production_line,sf.production.line,model_sf_production_line,sf_base.group_sf_mrp_user,1,1,1,0 access_sf_production_line_manager,sf.production.line,model_sf_production_line,sf_base.group_sf_mrp_manager,1,1,1,0 access_maintenance_equipment_tool,maintenance_equipment_tool,model_maintenance_equipment_tool,sf_base.group_sf_mrp_user,1,0,0,0 access_maintenance_equipment_tool_manager,maintenance_equipment_tool,model_maintenance_equipment_tool,sf_base.group_sf_mrp_manager,1,1,1,0 @@ -42,7 +42,7 @@ access_mrp_production_stock_worker,mrp.production stock_worker,mrp.model_mrp_pro access_product_product_user,product.product user,product.model_product_product,sf_base.group_sf_mrp_user,1,0,0,0 access_product_template_user,product.template user,product.model_product_template,sf_base.group_sf_mrp_user,1,0,0,0 access_uom_uom_user,uom.uom user,uom.model_uom_uom,sf_base.group_sf_mrp_user,1,0,0,0 -access_product_supplierinfo_user,product.supplierinfo user,product.model_product_supplierinfo,sf_base.group_sf_mrp_user,1,1,1,0 +access_product_supplierinfo_user,product.supplierinfo user,product.model_product_supplierinfo,sf_base.group_sf_mrp_user,1,0,0,0 access_res_partner,res.partner,base.model_res_partner,sf_base.group_sf_mrp_user,1,0,0,0 access_mrp_workorder_mrp_user,mrp.workorder.user,mrp.model_mrp_workorder,sf_base.group_sf_mrp_user,1,1,1,0 access_mrp_workorder_mrp_manager,mrp.workorder,mrp.model_mrp_workorder,sf_base.group_sf_mrp_user,1,1,1,0 @@ -90,6 +90,7 @@ access_mrp_workcenter_capacity_manager,mrp.workcenter.capacity.manager,mrp.model access_mrp_production,mrp_production,model_mrp_production,sf_base.group_plan_dispatch,1,1,1,0 access_mrp_workorder,mrp_workorder,model_mrp_workorder,sf_base.group_plan_dispatch,1,1,1,0 access_sf_production_line,sf.production.line,model_sf_production_line,sf_base.group_plan_dispatch,1,1,1,0 +access_sf_production_line,sf.production.line,model_sf_production_line,sf_maintenance.sf_group_equipment_user,1,1,1,0 access_mrp_workcenter,mrp_workcenter,model_mrp_workcenter,sf_base.group_plan_dispatch,1,1,1,0 access_mrp_bom,mrp.bom,mrp.model_mrp_bom,sf_base.group_plan_dispatch,1,1,1,0 access_mrp_bom_line,mrp.bom.line,mrp.model_mrp_bom_line,sf_base.group_plan_dispatch,1,0,0,0 From 631d59f95ebe28e6b4ff18cdbe1189de38bb41ff Mon Sep 17 00:00:00 2001 From: "qihao.gong@jikimo.com" Date: Mon, 8 Jan 2024 16:18:15 +0800 Subject: [PATCH 03/14] =?UTF-8?q?=E5=A4=84=E7=90=86=E6=9C=AC=E5=9C=B0?= =?UTF-8?q?=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_base/models/tool_base_new.py | 6 +- sf_base/models/tool_base_new.py.rej | 10 + sf_manufacturing/models/product_template.py | 217 ++++++-------------- 3 files changed, 78 insertions(+), 155 deletions(-) create mode 100644 sf_base/models/tool_base_new.py.rej diff --git a/sf_base/models/tool_base_new.py b/sf_base/models/tool_base_new.py index 1c7219bc..8f216f49 100644 --- a/sf_base/models/tool_base_new.py +++ b/sf_base/models/tool_base_new.py @@ -106,8 +106,10 @@ class CuttingToolModel(models.Model): chuck_basic_parameters_ids = fields.One2many('sf.tool.materials.basic.parameters', 'standard_library_id', string='夹头基本参数') cutting_speed_ids = fields.One2many('sf.cutting.speed', 'standard_library_id', string='切削速度Vc') - feed_per_tooth_ids = fields.One2many('sf.feed.per.tooth', 'standard_library_id', '每齿走刀量fz') - feed_per_tooth_ids_3 = fields.One2many('sf.feed.per.tooth', 'standard_library_id', '每齿走刀量fz') + feed_per_tooth_ids = fields.One2many('sf.feed.per.tooth', 'standard_library_id', '每齿走刀量fz', + domain=[('cutting_speed', '!=', False)]) + feed_per_tooth_ids_3 = fields.One2many('sf.feed.per.tooth', 'standard_library_id', '每齿走刀量fz', + domain=[('cutting_speed', '!=', False)]) material_model_id = fields.Many2one('sf.materials.model', '材料型号') # 适用夹头型号可以多选 diff --git a/sf_base/models/tool_base_new.py.rej b/sf_base/models/tool_base_new.py.rej new file mode 100644 index 00000000..6db1f28a --- /dev/null +++ b/sf_base/models/tool_base_new.py.rej @@ -0,0 +1,10 @@ +diff a/sf_base/models/tool_base_new.py b/sf_base/models/tool_base_new.py (rejected hunks) +@@ -108,6 +108,4 @@ + cutting_speed_ids = fields.One2many('sf.cutting.speed', 'standard_library_id', string='切削速度Vc') +- feed_per_tooth_ids = fields.One2many('sf.feed.per.tooth', 'standard_library_id', '每齿走刀量fz', +- domain=[('cutting_speed', '!=', False)]) +- feed_per_tooth_ids_3 = fields.One2many('sf.feed.per.tooth', 'standard_library_id', '每齿走刀量fz', +- domain=[('cutting_speed', '!=', False)]) ++ feed_per_tooth_ids = fields.One2many('sf.feed.per.tooth', 'standard_library_id', '每齿走刀量fz') ++ feed_per_tooth_ids_3 = fields.One2many('sf.feed.per.tooth', 'standard_library_id', '每齿走刀量fz') + diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py index 23c659f5..285d43f0 100644 --- a/sf_manufacturing/models/product_template.py +++ b/sf_manufacturing/models/product_template.py @@ -202,6 +202,7 @@ class ResProductMo(models.Model): self.feed_per_tooth_ids = self.cutting_tool_model_id.feed_per_tooth_ids.filtered( lambda r: int(r.blade_diameter) == int(self.specification_id.blade_diameter)) elif self.cutting_tool_type == '夹头': + self.cutting_tool_clamping_length = self.specification_id.clamping_length self.cutting_tool_clamping_tolerance = self.specification_id.clamping_tolerance self.cutting_tool_clamping_diameter_min = self.specification_id.min_clamping_diameter self.cutting_tool_clamping_diameter_min = self.specification_id.max_clamping_diameter @@ -227,12 +228,14 @@ class ResProductMo(models.Model): self.cutting_tool_inscribed_circle_tolerance = self.specification_id.inscribed_circle_tolerance self.cutting_tool_install_aperture_diameter = self.specification_id.install_aperture_diameter self.cutting_tool_chip_breaker_groove = self.specification_id.chip_breaker_groove - self.cutting_tool_chip_breaker_type_code = self.specification_id.chip_breaker_type_code + # self.cutting_tool_cut_depth_max = self.specification_id.blade_blade_number self.cutting_tool_blade_blade_number = self.specification_id.blade_blade_number self.cutting_tool_blade_width = self.specification_id.blade_width self.cutting_tool_rear_angle = self.specification_id.relief_angle self.cutting_tool_main_included_angle = self.specification_id.main_included_angle self.cutting_tool_top_angle = self.specification_id.top_angle + self.cutting_tool_blade_tip_dip_angle = self.specification_id.blade_tip_dip_angle + self.cutting_tool_side_cutting_edge_angle = self.specification_id.side_cutting_edge_angle self.cutting_tool_pitch = self.specification_id.pitch self.cutting_tool_bladed_teeth_model = self.specification_id.blade_teeth_model self.cutting_tool_thickness_tolerance = self.specification_id.thickness_tolerance @@ -254,20 +257,13 @@ class ResProductMo(models.Model): self.cutting_tool_inscribed_circle_tolerance = self.specification_id.inscribed_circle_tolerance self.cutting_tool_install_aperture_diameter = self.specification_id.install_aperture_diameter self.cutting_tool_chip_breaker_groove = self.specification_id.chip_breaker_groove - self.cutting_tool_chip_breaker_type_code = self.specification_id.chip_breaker_type_code + # self.cutting_tool_cut_depth_max = self.specification_id.blade_blade_number self.cutting_tool_blade_blade_number = self.specification_id.blade_blade_number self.cutting_tool_blade_width = self.specification_id.blade_width self.cutting_tool_rear_angle = self.specification_id.relief_angle self.cutting_tool_main_included_angle = self.specification_id.main_included_angle self.cutting_tool_top_angle = self.specification_id.top_angle - self.cutting_tool_screw = self.specification_id.screw - self.cutting_tool_wrench = self.specification_id.wrench - self.cutting_tool_blade_id = self.specification_id.blade_id - self.cutting_tool_is_cooling_hole = self.specification_id.is_cooling_hole - self.cutting_tool_locating_slot_code = self.specification_id.locating_slot_code - self.cutting_tool_install_blade_tip_num = self.specification_id.install_blade_tip_num - self.cutting_tool_installing_structure = self.specification_id.installing_structure - self.cutting_tool_cut_depth_max = self.specification_id.cut_depth_max + self.cutting_tool_blade_tip_dip_angle = self.specification_id.blade_tip_dip_angle if self.cutting_tool_type == '刀盘': self.cutting_tool_blade_length = self.specification_id.blade_length self.cutting_tool_cutter_head_diameter = self.specification_id.cutter_head_diameter @@ -276,27 +272,17 @@ class ResProductMo(models.Model): self.cutting_tool_knife_head_height = self.specification_id.knife_head_height self.cutting_tool_knife_head_width = self.specification_id.knife_head_width self.cutting_tool_knife_head_length = self.specification_id.knife_head_length - self.cutting_tool_tool_shim = self.specification_id.tool_shim - self.cutting_tool_cotter_pin = self.specification_id.cotter_pin - self.cutting_tool_pressing_plate = self.specification_id.pressing_plate elif self.cutting_tool_type == '刀柄': self.cutting_tool_total_length = self.specification_id.total_length + self.cutting_tool_standard_speed = self.specification_id.standard_rotate_speed self.cutting_tool_speed_max = self.specification_id.max_rotate_speed self.cutting_tool_change_time = self.specification_id.tool_changing_time self.cutting_tool_total_length = self.specification_id.total_length self.cutting_tool_clamping_diameter_max = self.specification_id.max_clamping_diameter self.cutting_tool_clamping_diameter_min = self.specification_id.min_clamping_diameter self.cutting_tool_flange_length = self.specification_id.flange_shank_length - self.cutting_tool_flange_diameter = self.specification_id.flange_diameter - self.cutting_tool_fit_chuck_size = self.specification_id.fit_chuck_size - self.cutting_tool_dynamic_balance_class = self.specification_id.dynamic_balance_class - self.cutting_tool_is_high_speed_cutting = self.specification_id.is_quick_cutting - self.cutting_tool_is_safety_lock = self.specification_id.is_safe_lock - self.cutting_tool_fit_nut_model = self.specification_id.nut - self.cutting_tool_wrench = self.specification_id.spanner - self.cutting_tool_chuck_id = self.specification_id.chuck_id.id - self.cutting_tool_jump_accuracy = self.specification_id.diameter_slip_accuracy - self.cutting_tool_taper_shank_model = self.specification_id.taper_shank_model + self.cutting_tool_shank_outer_diameter = self.specification_id.handle_external_diameter + self.cutting_tool_shank_inner_diameter = self.specification_id.handle_inside_diameter self.suitable_machining_method_ids = [(6, 0, [])] if not \ self.cutting_tool_model_id.suitable_machining_method_ids \ else [(6, 0, self.cutting_tool_model_id.suitable_machining_method_ids.ids)] @@ -364,12 +350,12 @@ class ResProductMo(models.Model): raise ValidationError("请选择压紧方式") if self.cutting_tool_type == '刀片': if not self.suitable_coolant_ids: - raise ValidationError("请选择适合冷却方式") + raise ValidationError("请选择适合冷却液") elif self.cutting_tool_type == '整体式刀具': if not self.handle_type_id: raise ValidationError("请选择柄部类型") if not self.suitable_coolant_ids: - raise ValidationError("请选择适合冷却方式") + raise ValidationError("请选择适合冷却液") if not self.suitable_machining_method_ids: raise ValidationError("请选择适合加工方式") if not self.blade_tip_characteristics_id: @@ -383,8 +369,11 @@ class ResProductMo(models.Model): cutting_tool_rear_angle = fields.Integer('后角(°)') cutting_tool_main_included_angle = fields.Integer('主偏角(°)') # 适用夹头型号可以多选 - cutting_tool_chuck_id = fields.Many2one( + cutting_tool_chuck_ids = fields.Many2many( 'sf.cutting_tool.standard.library', + relation='product_cutting_tool_library_handle_chuck_rel', + column1='model_id_1', + column2='model_id_2', domain="[('cutting_tool_type', '=', '夹头')]", string='适用夹头型号') # 刀片参数 @@ -395,7 +384,6 @@ class ResProductMo(models.Model): cutting_tool_install_aperture_diameter = fields.Float('安装孔直径(mm)') cutting_tool_chip_breaker_groove = fields.Selection([('无', '无'), ('单面', '单面'), ('双面', '双面')], string='有无断屑槽') - cutting_tool_chip_breaker_type_code = fields.Char('断屑槽型代号') cutting_tool_bladed_teeth_model = fields.Selection( [('无', '无'), ('V牙型', 'V牙型'), ('米制全牙型', '米制全牙型'), ('美制全牙型', '美制全牙型'), ('惠氏全牙型', '惠氏全牙型'), ('BSPT全牙型', 'BSPT全牙型'), ('NPT全牙型', 'NPT全牙型'), @@ -407,6 +395,8 @@ class ResProductMo(models.Model): ('7', '7'), ('8', '8'), ('9', '9'), ('10', '10')], string='刀片的刃数(个)') + cutting_tool_blade_tip_dip_angle = fields.Integer('刀尖倾角(°)') + cutting_tool_side_cutting_edge_angle = fields.Integer('侧切削角(°)') cutting_tool_thread_model = fields.Selection([('无', '无'), ('外螺纹', '外螺纹'), ('内螺纹', '内螺纹')], string='螺纹类型') cutting_tool_thread_num = fields.Float('每英寸螺纹数(tpi)') @@ -441,8 +431,11 @@ class ResProductMo(models.Model): cutting_tool_min_machining_aperture = fields.Integer('最小加工孔径(mm)') cutting_tool_install_blade_tip_num = fields.Integer('可装刀片数/齿数(个)', size=20) cutting_tool_installing_structure = fields.Char('安装结构', size=20) - cutting_tool_blade_id = fields.Many2one( + cutting_tool_blade_ids = fields.Many2many( 'sf.cutting_tool.standard.library', + relation='product_cutting_tool_library_pad_blade_rel', + column1='model_id_1', + column2='model_id_2', domain="[('cutting_tool_type', '=', '刀片')]", string='适用刀片型号' # 使用空列表作为默认值 ) @@ -458,23 +451,24 @@ class ResProductMo(models.Model): cutting_tool_interface_diameter = fields.Float('接口直径(mm)') # 刀柄参数 + cutting_tool_shank_outer_diameter = fields.Float('柄部外径(mm)') + cutting_tool_shank_inner_diameter = fields.Float('柄部内径(mm)') + cutting_tool_clamping_length = fields.Float('夹持长度(mm)') + cutting_tool_clamping_tolerance = fields.Float('夹持公差(mm)') cutting_tool_clamping_diameter_max = fields.Float('最大夹持直径') cutting_tool_clamping_diameter_min = fields.Float('最小夹持直径') cutting_tool_flange_length = fields.Float('法兰柄长(mm)') cutting_tool_flange_diameter = fields.Float('法兰直径(mm)') + cutting_tool_is_rough_finish = fields.Boolean('可粗加工', default=False) + cutting_tool_is_finish = fields.Boolean('可精加工', default=False) + cutting_tool_is_drill_hole = fields.Boolean('可钻孔', default=False) cutting_tool_is_safety_lock = fields.Boolean('有无安全锁', default=False) cutting_tool_is_high_speed_cutting = fields.Boolean('可高速切削', default=False) cutting_tool_change_time = fields.Integer('换刀时间(s)') cutting_tool_clamping_way = fields.Char('夹持方式') - cutting_tool_fit_chuck_size = fields.Char('适配夹头尺寸') - cutting_tool_taper_shank_model = fields.Char('锥柄型号') cutting_tool_standard_speed = fields.Integer('标准转速(n/min)') cutting_tool_speed_max = fields.Integer('最大转速(n/min)') cutting_tool_cooling_type = fields.Char('冷却类型') - cutting_tool_dynamic_balance_class = fields.Char('动平衡等级') - cutting_tool_fit_nut_model = fields.Char('适用锁紧螺母型号') - - # 夹头参数 cutting_tool_taper = fields.Integer('锥度(°)') cutting_tool_top_diameter = fields.Float('顶部直径') @@ -482,7 +476,7 @@ class ResProductMo(models.Model): cutting_tool_inner_diameter = fields.Float('内径(mm)') cooling_suit_type_ids = fields.Char('适用冷却套型号') cutting_tool_max_load_capacity = fields.Float('最大负载能力(kg)') - cutting_tool_er_size_model = fields.Char('尺寸型号') + cutting_tool_er_size_model = fields.Char('ER尺寸型号') cutting_tool_handle_ids = fields.Many2many( 'sf.cutting_tool.standard.library', relation='product_cutting_tool_library_chuck_handle_rel', @@ -492,6 +486,28 @@ class ResProductMo(models.Model): string='适用刀柄型号' ) + # 夹具参数 + fixture_material_id = fields.Many2one('sf.fixture.material', string="夹具物料") + fixture_model_id = fields.Many2one('sf.fixture.model', string="夹具型号") + fixture_material_type = fields.Char(string="夹具物料类型", related='fixture_material_id.name') + fixture_multi_mounting_type_id = fields.Many2one('sf.multi_mounting.type', string="联装类型") + fixture_clamping_way = fields.Char(string="装夹方式") + fixture_port_type = fields.Char(string="接口类型") + fixture_model_file = fields.Binary(string="3D模型图") + + fixture_clamp_workpiece_length_max = fields.Integer(string="夹持工件长度max(mm)") + fixture_clamp_workpiece_width_max = fields.Integer(string="夹持工件宽度max(mm)") + fixture_clamp_workpiece_height_max = fields.Integer(string="夹持工件高度max(mm)") + fixture_clamp_workpiece_diameter_max = fields.Float(string="夹持工件直径max(mm)", digits=(16, 6)) + + fixture_maximum_carrying_weight = fields.Float(string="最大承载重量(kg)", digits=(16, 4)) + fixture_maximum_clamping_force = fields.Integer(string="最大夹持力(n)") + fixture_driving_way = fields.Char(string="驱动方式") + fixture_apply_machine_tool_type_ids = fields.Many2many('sf.machine_tool.type', 'rel_product_machine_tool_type', + string="适用机床型号") + fixture_through_hole_size = fields.Integer(string="过孔大小(mm)") + fixture_screw_size = fields.Integer(string="螺牙大小(mm)") + # 注册状态 register_state = fields.Selection([('未注册', '未注册'), ('已注册', '已注册'), ('注册失败', '注册失败')], string='注册状态', default='未注册') @@ -553,6 +569,12 @@ class ResProductMo(models.Model): code_arr.append(i.code) return code_arr + def _json_chuck_item_code(self, item): + code_arr = [] + for i in item.product_id.cutting_tool_chuck_ids: + code_arr.append(i.code) + return code_arr + def _json_cutter_bar_item_code(self, item): code_arr = [] for i in item.product_id.cutting_tool_cutter_bar_ids: @@ -565,6 +587,12 @@ class ResProductMo(models.Model): code_arr.append(i.code) return code_arr + def _json_blade_item_code(self, item): + code_arr = [] + for i in item.product_id.cutting_tool_blade_ids: + code_arr.append(i.code) + return code_arr + def _json_handle_item_code(self, item): code_arr = [] for i in item.product_id.cutting_tool_handle_ids: @@ -597,6 +625,7 @@ class ResProductMo(models.Model): for item in self: if self.fixture_material_type in ['气动夹具', '转接板(锁板)夹具', '磁吸夹具', '虎钳夹具', '零点卡盘']: item.brand_id = item.fixture_model_id.brand_id.id + item.fixture_multi_mounting_type_id = item.fixture_model_id.multi_mounting_type_id.id item.fixture_model_file = item.fixture_model_id.model_file item.tool_length = item.fixture_model_id.length item.tool_width = item.fixture_model_id.width @@ -797,124 +826,6 @@ class ResProductMo(models.Model): return base64_data -class ResProductFixture(models.Model): - _inherit = 'product.template' - _description = '夹具产品信息' - - fixture_model_id = fields.Many2one('sf.fixture.model', '夹具型号') - specification_fixture_id = fields.Many2one('sf.fixture.materials.basic.parameters', '夹具规格') - - fixture_material_id = fields.Many2one('sf.fixture.material', string="夹具物料", required=True) - fixture_material_type = fields.Char(string="夹具物料类型", related='fixture_material_id.name') - multi_mounting_type_id = fields.Many2one('sf.multi_mounting.type', string="联装类型", required=True) - model_file = fields.Binary(string="3D模型图") - - # 夹具物料基本参数 - # length = fields.Float('长度(mm)', digits=(16, 2)) - # width = fields.Float('宽度(mm)', digits=(16, 2)) - # height = fields.Float('高度(mm)', digits=(16, 2)) - diameter = fields.Float('直径(mm)', digits=(16, 2)) - - # '零点卡盘' 字段 - weight = fields.Float('重量(mm)', digits=(16, 2)) - orientation_dish_diameter = fields.Float('定位盘直径(mm)', digits=(16, 2)) - clamping_diameter = fields.Float('装夹直径(mm)', digits=(16, 2)) - clamping_num = fields.Selection([('1', '1'), ('2', '2'), ('4', '4'), ('6', '6'), ('8', '8')], string='装夹单元数') - chucking_power_max = fields.Float('最大夹持力(KN)', digits=(16, 2)) - repeated_positioning_accuracy = fields.Char('重复定位精度(mm)', size=20) - boolean_transposing_hole = fields.Boolean('是否有转位孔') - unlocking_method = fields.Selection( - [('手动', '手动'), ('气动', '气动'), ('液压', '液压'), ('电动', '电动'), ('其他', '其他')], string='解锁方式') - boolean_chip_blowing_function = fields.Boolean('是否有吹屑功能') - carrying_capacity_max = fields.Float('最大承载重量(kg)', digits=(16, 2)) - rigidity = fields.Integer('硬度HRC') - materials_model_id = fields.Many2one('sf.materials.model', '夹具材质') - machine_tool_type_id = fields.Many2one('sf.machine_tool.type', '适用机床型号') - - # ’零点托盘‘ 字段 - connector_diameter = fields.Selection([('2', '2'), ('3', '3'), ('4', '4'), ('5', '5'), ('6', '6'), ('8', '8')], - string='连接头直径(mm)') - way_to_install = fields.Selection( - [('接口式', '接口式'), ('螺栓固定', '螺栓固定'), ('磁吸式', '磁吸式'), ('其他', '其他')], string='安装方式') - type_of_drive = fields.Selection( - [('气动式', '气动式'), ('液压式', '液压式'), ('机械式', '机械式'), ('电动式', '电动式'), ('其他', '其他')], - string='驱动方式') - - # ’气动夹具‘ 字段 - gripper_length_min = fields.Float('夹持工件最小长度(mm)', digits=(16, 2)) - gripper_width_min = fields.Float('夹持工件最小宽度(mm)', digits=(16, 2)) - gripper_height_min = fields.Float('夹持工件最小高度(mm)', digits=(16, 2)) - gripper_diameter_min = fields.Float('夹持工件最小直径(mm)', digits=(16, 2)) - gripper_length_max = fields.Float('夹持工件最大长度(mm)', digits=(16, 2)) - gripper_width_max = fields.Float('夹持工件最大宽度(mm)', digits=(16, 2)) - gripper_height_max = fields.Float('夹持工件最大高度(mm)', digits=(16, 2)) - gripper_diameter_max = fields.Float('夹持工件最大直径(mm)', digits=(16, 2)) - rated_air_pressure = fields.Float('额定气压(Mpa)', digits=(16, 2)) - interface_materials_model_id = fields.Many2one('sf.materials.model', '接口类型') - - # ‘虎钳夹具' 字段 - transverse_groove = fields.Float('横向配合槽n(mm)', digits=(16, 2)) - longitudinal_fitting_groove = fields.Float('纵向配合槽l(mm)', digits=(16, 2)) - - # '磁吸夹具' 字段 - height_tolerance_value = fields.Char('高度公差(mm)') - rated_adsorption_force = fields.Float('额定吸附力(N/cm²)', digits=(16, 2)) - 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)) - - # '三爪卡盘' 字段 - mounting_hole_depth = fields.Float('安装孔深度(mm)', digits=(16, 2)) - centering_diameter = fields.Float('定心直径(mm)', digits=(16, 2)) - - @api.onchange('specification_fixture_id') - def _onchange_specification_fixture_id(self): - if self.specification_fixture_id: - self.length = self.specification_fixture_id.length - self.width = self.specification_fixture_id.width - self.height = self.specification_fixture_id.height - self.weight = self.specification_fixture_id.weight - self.diameter = self.specification_fixture_id.diameter - self.orientation_dish_diameter = self.specification_fixture_id.orientation_dish_diameter - self.clamping_diameter = self.specification_fixture_id.clamping_diameter - self.clamping_num = self.specification_fixture_id.clamping_num - self.chucking_power_max = self.specification_fixture_id.chucking_power_max - self.repeated_positioning_accuracy = self.specification_fixture_id.repeated_positioning_accuracy - self.boolean_transposing_hole = self.specification_fixture_id.boolean_transposing_hole - self.unlocking_method = self.specification_fixture_id.unlocking_method - self.boolean_chip_blowing_function = self.specification_fixture_id.boolean_chip_blowing_function - self.carrying_capacity_max = self.specification_fixture_id.carrying_capacity_max - self.rigidity = self.specification_fixture_id.rigidity - self.materials_model_id = self.specification_fixture_id.materials_model_id - self.machine_tool_type_id = self.specification_fixture_id.machine_tool_type_id - self.connector_diameter = self.specification_fixture_id.connector_diameter - self.way_to_install = self.specification_fixture_id.way_to_install - self.type_of_drive = self.specification_fixture_id.type_of_drive - self.gripper_length_min = self.specification_fixture_id.gripper_length_min - self.gripper_width_min = self.specification_fixture_id.gripper_width_min - self.gripper_height_min = self.specification_fixture_id.gripper_height_min - self.gripper_diameter_min = self.specification_fixture_id.gripper_diameter_min - self.gripper_length_max = self.specification_fixture_id.gripper_length_max - self.gripper_width_max = self.specification_fixture_id.gripper_width_max - self.gripper_height_max = self.specification_fixture_id.gripper_height_max - self.gripper_diameter_max = self.specification_fixture_id.gripper_diameter_max - self.rated_air_pressure = self.specification_fixture_id.rated_air_pressure - self.interface_materials_model_id = self.specification_fixture_id.interface_materials_model_id - self.transverse_groove = self.specification_fixture_id.transverse_groove - self.longitudinal_fitting_groove = self.specification_fixture_id.longitudinal_fitting_groove - self.height_tolerance_value = self.specification_fixture_id.height_tolerance_value - self.rated_adsorption_force = self.specification_fixture_id.rated_adsorption_force - self.magnetic_field_height = self.specification_fixture_id.magnetic_field_height - self.magnetic_pole_plate_grinding_allowance = self.specification_fixture_id.magnetic_pole_plate_grinding_allowance - self.screw_size = self.specification_fixture_id.screw_size - self.via_hole_diameter = self.specification_fixture_id.via_hole_diameter - self.mounting_hole_depth = self.specification_fixture_id.mounting_hole_depth - self.centering_diameter = self.specification_fixture_id.centering_diameter - - class SfMaintenanceEquipmentAndProductTemplate(models.Model): _inherit = 'maintenance.equipment' _description = '设备' From 498e1c12afb6e03ffaec9f6a30d50fc0aaf8a0a0 Mon Sep 17 00:00:00 2001 From: yuxianghui <3437689193@qq.com> Date: Mon, 8 Jan 2024 17:42:34 +0800 Subject: [PATCH 04/14] =?UTF-8?q?1=E3=80=81=E6=89=80=E6=9C=89=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=88=80=E5=85=B7=E7=9B=B8=E5=85=B3=E6=A8=A1=E5=9E=8B?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=80=E5=85=B7=E7=BB=84=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=AF=B9=E8=B1=A1=EF=BC=8C=E5=B9=B6=E4=B8=94=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=88=80=E5=85=B7=E5=90=8D=E7=A7=B0=E6=A0=B9=E6=8D=AE=E8=A7=84?= =?UTF-8?q?=E5=88=99=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90=EF=BC=9B2?= =?UTF-8?q?=E3=80=81=E5=8A=9F=E8=83=BD=E5=88=80=E5=85=B7=E7=BB=84=E8=A3=85?= =?UTF-8?q?=E6=97=B6=E6=8C=89=E8=A7=84=E5=88=99=E8=87=AA=E5=8A=A8=E7=94=9F?= =?UTF-8?q?=E6=88=90=E5=8A=9F=E8=83=BD=E5=88=80=E5=85=B7=E7=BC=96=E7=A0=81?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_manufacturing/models/product_template.py | 79 +++++++++++++------- sf_tool_management/models/base.py | 19 ++++- sf_tool_management/views/tool_base_views.xml | 38 ++++++++-- sf_tool_management/wizard/wizard.py | 78 ++++++++++++++++++- sf_tool_management/wizard/wizard_view.xml | 8 +- 5 files changed, 179 insertions(+), 43 deletions(-) diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py index 333da9aa..b974dba4 100644 --- a/sf_manufacturing/models/product_template.py +++ b/sf_manufacturing/models/product_template.py @@ -486,6 +486,8 @@ class ResProductMo(models.Model): string='适用刀柄型号' ) + + # 注册状态 register_state = fields.Selection([('未注册', '未注册'), ('已注册', '已注册'), ('注册失败', '注册失败')], string='注册状态', default='未注册') @@ -598,35 +600,35 @@ class ResProductMo(models.Model): if item.fixture_material_id.id != item.fixture_model_id.fixture_material_id.id: item.fixture_model_id = False - @api.onchange('fixture_model_id') - def _onchange_fixture_model_id(self): - for item in self: - if self.fixture_material_type in ['气动夹具', '转接板(锁板)夹具', '磁吸夹具', '虎钳夹具', '零点卡盘']: - item.brand_id = item.fixture_model_id.brand_id.id - item.fixture_multi_mounting_type_id = item.fixture_model_id.multi_mounting_type_id.id - item.fixture_model_file = item.fixture_model_id.model_file - item.tool_length = item.fixture_model_id.length - item.tool_width = item.fixture_model_id.width - item.tool_height = item.fixture_model_id.height - item.tool_weight = item.fixture_model_id.weight - item.materials_type_id = item.fixture_model_id.materials_model_id.id - item.fixture_maximum_carrying_weight = item.fixture_model_id.maximum_carrying_weight - item.fixture_maximum_clamping_force = item.fixture_model_id.maximum_clamping_force - if self.fixture_material_type in ['零点卡盘', '转接板(锁板)夹具']: - item.fixture_clamping_way = item.fixture_model_id.clamping_way - item.fixture_port_type = item.fixture_model_id.port_type - if self.fixture_material_type in ['气动夹具', '转接板(锁板)夹具', '磁吸夹具']: - item.fixture_driving_way = item.fixture_model_id.driving_way - if self.fixture_material_type in ['气动夹具', '磁吸夹具', '虎钳夹具', '零点卡盘']: - item.fixture_through_hole_size = item.fixture_model_id.through_hole_size - item.fixture_screw_size = item.fixture_model_id.screw_size - if self.fixture_material_type in ['气动夹具', '转接板(锁板)夹具', '磁吸夹具', '虎钳夹具']: - item.fixture_clamp_workpiece_length_max = item.fixture_model_id.clamp_workpiece_length_max - item.fixture_clamp_workpiece_width_max = item.fixture_model_id.clamp_workpiece_width_max - item.fixture_clamp_workpiece_height_max = item.fixture_model_id.clamp_workpiece_height_max - item.fixture_clamp_workpiece_diameter_max = item.fixture_model_id.clamp_workpiece_diameter_max - item.fixture_apply_machine_tool_type_ids = self._get_ids( - item.fixture_model_id.apply_machine_tool_type_ids) + # @api.onchange('fixture_model_id') + # def _onchange_fixture_model_id(self): + # for item in self: + # if self.fixture_material_type in ['气动夹具', '转接板(锁板)夹具', '磁吸夹具', '虎钳夹具', '零点卡盘']: + # item.brand_id = item.fixture_model_id.brand_id.id + # item.fixture_multi_mounting_type_id = item.fixture_model_id.multi_mounting_type_id.id + # item.fixture_model_file = item.fixture_model_id.model_file + # item.tool_length = item.fixture_model_id.length + # item.tool_width = item.fixture_model_id.width + # item.tool_height = item.fixture_model_id.height + # item.tool_weight = item.fixture_model_id.weight + # item.materials_type_id = item.fixture_model_id.materials_model_id.id + # item.fixture_maximum_carrying_weight = item.fixture_model_id.maximum_carrying_weight + # item.fixture_maximum_clamping_force = item.fixture_model_id.maximum_clamping_force + # if self.fixture_material_type in ['零点卡盘', '转接板(锁板)夹具']: + # item.fixture_clamping_way = item.fixture_model_id.clamping_way + # item.fixture_port_type = item.fixture_model_id.port_type + # if self.fixture_material_type in ['气动夹具', '转接板(锁板)夹具', '磁吸夹具']: + # item.fixture_driving_way = item.fixture_model_id.driving_way + # if self.fixture_material_type in ['气动夹具', '磁吸夹具', '虎钳夹具', '零点卡盘']: + # item.fixture_through_hole_size = item.fixture_model_id.through_hole_size + # item.fixture_screw_size = item.fixture_model_id.screw_size + # if self.fixture_material_type in ['气动夹具', '转接板(锁板)夹具', '磁吸夹具', '虎钳夹具']: + # item.fixture_clamp_workpiece_length_max = item.fixture_model_id.clamp_workpiece_length_max + # item.fixture_clamp_workpiece_width_max = item.fixture_model_id.clamp_workpiece_width_max + # item.fixture_clamp_workpiece_height_max = item.fixture_model_id.clamp_workpiece_height_max + # item.fixture_clamp_workpiece_diameter_max = item.fixture_model_id.clamp_workpiece_diameter_max + # item.fixture_apply_machine_tool_type_ids = self._get_ids( + # item.fixture_model_id.apply_machine_tool_type_ids) def _get_volume_uom_id_from_ir_config_parameter(self): product_length_in_feet_param = self.env['ir.config_parameter'].sudo().get_param('product.volume_in_cubic_feet') @@ -877,6 +879,25 @@ class ResProductFixture(models.Model): mounting_hole_depth = fields.Float('安装孔深度(mm)', digits=(16, 2)) centering_diameter = fields.Float('定心直径(mm)', digits=(16, 2)) + # (待删除字段) + fixture_multi_mounting_type_id = fields.Many2one('sf.multi_mounting.type', string="联装类型") + fixture_clamping_way = fields.Char(string="装夹方式") + fixture_port_type = fields.Char(string="接口类型") + fixture_model_file = fields.Binary(string="3D模型图") + + fixture_clamp_workpiece_length_max = fields.Integer(string="夹持工件长度max(mm)") + fixture_clamp_workpiece_width_max = fields.Integer(string="夹持工件宽度max(mm)") + fixture_clamp_workpiece_height_max = fields.Integer(string="夹持工件高度max(mm)") + fixture_clamp_workpiece_diameter_max = fields.Float(string="夹持工件直径max(mm)", digits=(16, 6)) + + fixture_maximum_carrying_weight = fields.Float(string="最大承载重量(kg)", digits=(16, 4)) + fixture_maximum_clamping_force = fields.Integer(string="最大夹持力(n)") + fixture_driving_way = fields.Char(string="驱动方式") + fixture_apply_machine_tool_type_ids = fields.Many2many('sf.machine_tool.type', 'rel_product_machine_tool_type', + string="适用机床型号") + fixture_through_hole_size = fields.Integer(string="过孔大小(mm)") + fixture_screw_size = fields.Integer(string="螺牙大小(mm)") + @api.onchange('specification_fixture_id') def _onchange_specification_fixture_id(self): if self.specification_fixture_id: diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py index d64b8ee1..01f46343 100644 --- a/sf_tool_management/models/base.py +++ b/sf_tool_management/models/base.py @@ -10,8 +10,8 @@ class FunctionalCuttingToolEntity(models.Model): _name = 'sf.functional.cutting.tool.entity' _description = '功能刀具列表' - code = fields.Char('编码', related='functional_tool_name_id.code') 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') name = fields.Char(related='functional_tool_name_id.name') functional_tool_name_id = fields.Many2one('sf.functional.tool.assembly', string='功能刀具名称', readonly=True) barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号', readonly=True) @@ -259,8 +259,8 @@ class RealTimeDistributionOfFunctionalTools(models.Model): _name = 'sf.real.time.distribution.of.functional.tools' _description = '功能刀具安全库存' - name = fields.Char('功能刀具名称', readonly=False) - tool_groups_id = fields.Many2one('sf.tool.groups', '刀具组') + name = fields.Char('功能刀具名称', readonly=True, compute='_compute_name') + tool_groups_id = fields.Many2one('sf.tool.groups', '刀具组', readonly=False, required=True) sf_cutting_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=False, group_expand='_read_mrs_cutting_tool_type_ids', store=True) diameter = fields.Integer(string='刀具直径(mm)', readonly=False) @@ -303,6 +303,14 @@ class RealTimeDistributionOfFunctionalTools(models.Model): sf_functional_tool_assembly_ids = fields.Many2many('sf.functional.tool.assembly', 'sf_functional_tool_assembly_ref', '功能刀具组装单', readonly=True) + @api.depends('tool_groups_id', 'diameter', 'knife_tip_r_angle') + def _compute_name(self): + for obj in self: + if obj.tool_groups_id: + obj.name = '%s-D%sR%s' % (obj.tool_groups_id.name, obj.diameter, obj.knife_tip_r_angle) + else: + obj.name = None + @api.constrains('min_stock_num', 'max_stock_num') def _check_stock_num(self): for obj in self: @@ -347,6 +355,7 @@ class RealTimeDistributionOfFunctionalTools(models.Model): functional_tool_assembly = tool.env['sf.functional.tool.assembly'].sudo().create({ 'functional_tool_name': tool.name, 'functional_tool_type_id': tool.sf_cutting_tool_type_id.id, + 'tool_groups_id': tool.tool_groups_id.id, 'functional_tool_diameter': tool.diameter, 'knife_tip_r_angle': tool.knife_tip_r_angle, 'coarse_middle_thin': tool.coarse_middle_thin, @@ -685,8 +694,10 @@ class FunctionalToolAssembly(models.Model): for obj in self: obj.name = obj.after_assembly_functional_tool_name + code = fields.Char('功能刀具编码', readonly=True) + tool_groups_id = fields.Many2one('sf.tool.groups', '刀具组', readonly=True) name = fields.Char(string='名称', readonly=True, compute='_compute_name') - assembly_order_code = fields.Char(string='编码', readonly=True) + assembly_order_code = fields.Char(string='组装单编码', readonly=True) functional_tool_name_id = fields.Many2one('product.product', string='功能刀具', readonly=True) functional_tool_name = fields.Char(string='功能刀具名称', readonly=True) diff --git a/sf_tool_management/views/tool_base_views.xml b/sf_tool_management/views/tool_base_views.xml index 62c0f0eb..f357168d 100644 --- a/sf_tool_management/views/tool_base_views.xml +++ b/sf_tool_management/views/tool_base_views.xml @@ -10,6 +10,7 @@ + @@ -80,9 +81,11 @@ + + + @@ -310,7 +314,7 @@

- +

@@ -318,6 +322,8 @@ + + + @@ -513,6 +521,8 @@ name="%(sf_tool_management.sf_tool_change_requirement_information_act)d" type="action" context="{ 'default_name':name, + 'default_code':code, + 'default_tool_groups_id':tool_groups_id, 'default_production_line_id': production_line_id, 'default_maintenance_equipment_id': maintenance_equipment_id, 'default_machine_table_type_id': machine_table_type_id, @@ -548,6 +558,8 @@ name="%(sf_tool_management.sf_tool_transfer_request_information_act)d" type="action" context="{ 'default_name':name, + 'default_code':code, + 'default_tool_groups_id':tool_groups_id, 'default_production_line_id': production_line_id, 'default_maintenance_equipment_id': maintenance_equipment_id, 'default_machine_table_type_id': machine_table_type_id, @@ -587,6 +599,8 @@ name="%(sf_tool_management.sf_tool_change_requirement_information_act)d" type="action" context="{ 'default_name':name, + 'default_code':code, + 'default_tool_groups_id':tool_groups_id, 'default_production_line_id': production_line_id, 'default_maintenance_equipment_id': maintenance_equipment_id, 'default_machine_table_type_id': machine_table_type_id, @@ -673,9 +687,11 @@ + + @@ -856,7 +872,9 @@ + + @@ -878,7 +896,7 @@ - +