diff --git a/jikimo_frontend/static/src/scss/custom_style.scss b/jikimo_frontend/static/src/scss/custom_style.scss index 5d660025..2b1c6cfc 100644 --- a/jikimo_frontend/static/src/scss/custom_style.scss +++ b/jikimo_frontend/static/src/scss/custom_style.scss @@ -135,7 +135,7 @@ td.o_required_modifier { .text-truncate { overflow: unset !important; text-overflow: unset !important; - white-space: nowrap!important; + //white-space: nowrap!important; } .o_list_renderer .o_list_table tbody > tr > td:not(.o_list_record_selector):not(.o_handle_cell):not(.o_list_button):not(.o_list_record_remove) { @@ -383,7 +383,9 @@ div:has(.o_required_modifier) > label::before { } } } - +.oe_kanban_details li.o_text_overflow { + display: block; +} .o_stock_kanban .o_kanban_card_content { .row { align-items: center; @@ -411,4 +413,25 @@ div:has(.o_required_modifier) > label::before { .o_inner_group.processingMethod { grid-template-columns: auto; } +} + +// 设置所有表格序号列padding为0 +.o_form_view .o_notebook > .tab-content > .tab-pane > :first-child:not(.o_group) .o_field_x2many.o_field_x2many_list tr > :first-child, .o_form_view .o_notebook > .tab-content > .tab-pane > :first-child.o_invisible_modifier + .o_field_widget .o_field_x2many.o_field_x2many_list tr > :first-child { + padding: 0; + text-align: center; +} + +// 设置剩余number类型数据表格列 left +.o_list_renderer .o_list_table thead .o_list_number_th { + text-align:left; +} +.o_list_renderer .o_list_table tbody > tr > td:not(.o_list_record_selector).o_list_number { + text-align: left; +} +.o_list_renderer .flex-row-reverse { + flex-direction: unset!important; +} + +.o_list_renderer .flex-row-reverse > .text-end { + text-align: left!important; } \ No newline at end of file diff --git a/jikimo_frontend/static/src/scss/rowno_in_tree.scss b/jikimo_frontend/static/src/scss/rowno_in_tree.scss index c244ad7d..5f8a2648 100644 --- a/jikimo_frontend/static/src/scss/rowno_in_tree.scss +++ b/jikimo_frontend/static/src/scss/rowno_in_tree.scss @@ -1,4 +1,4 @@ .row_no { - width: 3.2% !important; + width: 35px !important; vertical-align: middle; } diff --git a/sf_base/models/base.py b/sf_base/models/base.py index 36a39f49..a2565d6d 100644 --- a/sf_base/models/base.py +++ b/sf_base/models/base.py @@ -92,7 +92,7 @@ class MachineTool(models.Model): type_id = fields.Many2one('sf.machine_tool.type', '型号') brand_id = fields.Many2one('sf.machine.brand', string='品牌') state = fields.Selection( - [("正常", "正常"), ("故障", "故障"), ("不可用", "不可用")], + [("正常", "正常"), ("故障停机", "故障停机"), ("计划维保", "计划维保"),("空闲", "空闲"),("封存(报废)", "封存(报废)")], default='正常', string="机床状态") # 0606新增字段 machine_tool_picture = fields.Binary('图片') diff --git a/sf_base/models/basic_parameters_fixture.py b/sf_base/models/basic_parameters_fixture.py index 57d55bde..a1b1a9a6 100644 --- a/sf_base/models/basic_parameters_fixture.py +++ b/sf_base/models/basic_parameters_fixture.py @@ -16,7 +16,7 @@ class BasicParametersFixture(models.Model): 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='夹装单元数') + 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('是否有转位孔') @@ -65,4 +65,177 @@ class BasicParametersFixture(models.Model): # '三爪卡盘' 字段 mounting_hole_depth = fields.Float('安装孔深度(mm)', digits=(16, 2)) - centering_diameter = fields.Float('定心直径(mm)', digits=(16, 2)) \ No newline at end of file + 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': obj['materials_model_id'], + 'machine_tool_type_id': obj['machine_tool_type_id'], + }) + return zero_chuck_param_str + + 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': obj['materials_model_id'], + 'rigidity': obj['rigidity'], + }) + return zero_tray_param_str + + 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': obj['materials_model_id'], + 'rigidity': obj['rigidity'], + 'interface_materials_model_id': obj['interface_materials_model_id'], + 'type_of_drive': obj['type_of_drive'], + }) + return pneumatic_fixture_param_str + + 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': obj['materials_model_id'], + 'rigidity': obj['rigidity'], + 'interface_materials_model_id': obj['interface_materials_model_id'], + 'type_of_drive': obj['type_of_drive'], + }) + return jaw_vice_fixture_param_str + + 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': obj['materials_model_id'], + 'rigidity': obj['rigidity'], + 'interface_materials_model_id': obj['interface_materials_model_id'], + 'type_of_drive': obj['type_of_drive'], + }) + return magnet_fixture_param_str + + 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': obj['materials_model_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_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': obj['materials_model_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 diff --git a/sf_base/models/fixture.py b/sf_base/models/fixture.py index d6455550..c1591745 100644 --- a/sf_base/models/fixture.py +++ b/sf_base/models/fixture.py @@ -32,6 +32,7 @@ class FixtureModel(models.Model): multi_mounting_type_id = fields.Many2one('sf.multi_mounting.type', string="联装类型", required=True) brand_id = fields.Many2one('sf.machine.brand', string="品牌") model_file = fields.Binary(string="3D模型图") + status = fields.Boolean('状态') active = fields.Boolean('有效', default=False) zero_chuck_ids = fields.One2many('sf.fixture.materials.basic.parameters', 'fixture_model_id', diff --git a/sf_base/models/tool_base_new.py b/sf_base/models/tool_base_new.py index 4dc6b619..1c7219bc 100644 --- a/sf_base/models/tool_base_new.py +++ b/sf_base/models/tool_base_new.py @@ -106,18 +106,21 @@ 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', - 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') material_model_id = fields.Many2one('sf.materials.model', '材料型号') # 适用夹头型号可以多选 - chuck_ids = fields.Many2many( + # chuck_ids = fields.Many2many( + # 'sf.cutting_tool.standard.library', + # relation='cutting_tool_type_library_handle_chuck_rel', + # column1='model_id_1', + # column2='model_id_2', + # domain="[('cutting_tool_material_id.name', '=', '夹头')]", + # string='适用夹头型号') + + chuck_id = fields.Many2one( 'sf.cutting_tool.standard.library', - relation='cutting_tool_type_library_handle_chuck_rel', - column1='model_id_1', - column2='model_id_2', domain="[('cutting_tool_material_id.name', '=', '夹头')]", string='适用夹头型号') cutter_bar_ids = fields.Many2many( @@ -137,31 +140,31 @@ class CuttingToolModel(models.Model): string='适用刀盘型号' # 使用空列表作为默认值 ) # 刀杆/参数 - blade_ids = fields.Many2many( + # blade_ids = fields.Many2many( + # 'sf.cutting_tool.standard.library', + # relation='cutting_tool_type_library_pad_blade_rel', + # column1='model_id_1', + # column2='model_id_2', + # domain="[('cutting_tool_material_id.name', '=', '刀片')]", + # string='适用刀片型号' # 使用空列表作为默认值 + # ) + + handle_id = fields.Many2one( 'sf.cutting_tool.standard.library', - relation='cutting_tool_type_library_pad_blade_rel', - column1='model_id_1', - column2='model_id_2', - domain="[('cutting_tool_material_id.name', '=', '刀片')]", - string='适用刀片型号' # 使用空列表作为默认值 - ) - handle_ids = fields.Many2many( - 'sf.cutting_tool.standard.library', - relation='cutting_tool_type_library_chuck_handle_rel', - column1='model_id_1', - column2='model_id_2', domain="[('cutting_tool_material_id.name', '=', '刀柄')]", string='适用刀柄型号' ) + # handle_ids = fields.Many2many( + # 'sf.cutting_tool.standard.library', + # relation='cutting_tool_type_library_chuck_handle_rel', + # column1='model_id_1', + # column2='model_id_2', + # domain="[('cutting_tool_material_id.name', '=', '刀柄')]", + # string='适用刀柄型号' + # ) active = fields.Boolean('有效', default=True) is_cloud = fields.Boolean('云端数据', default=False) - # 无用字段 - feed_per_tooth_ids_2 = fields.One2many('sf.feed.per.tooth', 'standard_library_id', '每齿走刀量fz', - domain=[('machining_method', '!=', False)]) - feed_per_tooth_ids_4 = fields.One2many('sf.feed.per.tooth', 'standard_library_id', '每齿走刀量fz', - domain=[('machining_method', '!=', False)]) - def _get_ids(self, cutting_tool_type_code, factory_short_name): cutting_tool_type_ids = [] for item in cutting_tool_type_code: @@ -180,7 +183,7 @@ class MaintenanceStandardImage(models.Model): image = fields.Binary(string='图文') type = fields.Selection( [('加工能力', '加工能力'), ('刀尖特征', '刀尖特征'), ('柄部类型', '柄部类型'), ('走刀方向', '走刀方向'), - ('冷却液', '冷却液'), ('压紧方式', '压紧方式'), ('刀片形状', '刀片形状'), ('冷却方式', '冷却方式')], + ('压紧方式', '压紧方式'), ('刀片形状', '刀片形状'), ('冷却方式', '冷却方式')], string='特征') equipment_id = fields.Many2many('maintenance.equipment', 'image_id', string='设备') equipment_lq_id = fields.Many2many('maintenance.equipment', 'image_lq_id', string='设备') diff --git a/sf_base/models/tool_other_features.py b/sf_base/models/tool_other_features.py index 63ea66e7..154bf275 100644 --- a/sf_base/models/tool_other_features.py +++ b/sf_base/models/tool_other_features.py @@ -6,6 +6,7 @@ class ToolMaterialsBasicParameters(models.Model): _description = '刀具物料基本参数' name = fields.Char('物料号', size=50) + code = fields.Char('编码', size=50) standard_library_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀具标准库') cutting_tool_type = fields.Char(related='standard_library_id.cutting_tool_type', string='刀具物料类型', store=True) @@ -13,8 +14,8 @@ class ToolMaterialsBasicParameters(models.Model): # 整体式刀具参数 total_length = fields.Float('总长度(mm)') blade_number = fields.Selection( - [('2', '2'), ('3', '3'), ('4', '4'), ('5', '5'), ('6', '6'), ('7', '7'), ('8', '8')], - string='刃数(个)') + [('0', '0'), ('2', '2'), ('3', '3'), ('4', '4'), ('5', '5'), ('6', '6'), ('7', '7'), ('8', '8')], + string='刃数(个)', default='0') neck_diameter = fields.Float('颈部直径(mm)') neck_length = fields.Float('颈部长度(mm)') handle_diameter = fields.Float('柄部直径(mm)') @@ -40,19 +41,19 @@ class ToolMaterialsBasicParameters(models.Model): install_aperture_diameter = fields.Float('安装孔直径(mm)') chip_breaker_groove = fields.Selection([('无', '无'), ('单面', '单面'), ('双面', '双面')], string='有无断屑槽') + chip_breaker_type_code = fields.Char('断屑槽型代号') blade_teeth_model = fields.Selection( [('无', '无'), ('V牙型', 'V牙型'), ('米制全牙型', '米制全牙型'), ('美制全牙型', '美制全牙型'), ('惠氏全牙型', '惠氏全牙型'), ('BSPT全牙型', 'BSPT全牙型'), ('NPT全牙型', 'NPT全牙型'), ('UNJ全牙型', 'UNJ全牙型'), ('DIN405圆牙型', 'DIN405圆牙型'), ('ACME梯形', 'ACME梯形'), ('石油管螺纹刀片', '石油管螺纹刀片'), ('矮牙ACME梯形', '矮牙ACME梯形'), ('Trapeze30° 103', 'Trapeze30° 103')], string='刀片牙型', default='无') - blade_blade_number = fields.Selection([('1', '1'), ('2', '2'), ('3', '3'), ('4', '4'), ('5', '5'), ('6', '6'), - ('7', '7'), ('8', '8'), ('9', '9'), ('10', '10')], - string='刀片的刃数(个)') + blade_blade_number = fields.Selection( + [('0', '0'), ('1', '1'), ('2', '2'), ('3', '3'), ('4', '4'), ('5', '5'), ('6', '6'), ('7', '7'), ('8', '8'), + ('9', '9'), ('10', '10')], + string='刀片的刃数(个)', default='0') main_included_angle = fields.Integer('主偏角(°)') top_angle = fields.Integer('顶角(°)') - blade_tip_dip_angle = fields.Integer('刀尖倾角(°)') - side_cutting_edge_angle = fields.Integer('侧切削角(°)') thread_model = fields.Selection([('无', '无'), ('外螺纹', '外螺纹'), ('内螺纹', '内螺纹')], string='螺纹类型', default='无') thread_num = fields.Float('每英寸螺纹数(tpi)') @@ -73,11 +74,8 @@ class ToolMaterialsBasicParameters(models.Model): is_cooling_hole = fields.Boolean('有无冷却孔') locating_slot_code = fields.Char('定位槽代号', size=20) installing_structure = fields.Char('安装结构', size=20) - blade_ids = fields.Many2many( - 'sf.cutting.tool.type', - relation='basic_param_pad_blade_rel', - column1='model_id_1', - column2='model_id_2', + blade_id = fields.Many2one( + 'sf.cutting_tool.standard.library', domain="[('cutting_tool_material_id.name', '=', '刀片')]", string='适配刀片型号' # 使用空列表作为默认值 ) @@ -90,24 +88,34 @@ class ToolMaterialsBasicParameters(models.Model): cutter_head_diameter = fields.Float('刀盘直径(mm)') interface_diameter = fields.Float('接口直径(mm)') # 刀柄参数 - flange_shank_length = fields.Float('法兰柄长(mm)') + flange_shank_length = fields.Float('法兰长(mm)') + flange_diameter = fields.Float('法兰直径(mm)') + fit_chuck_size = fields.Char('适配夹头尺寸') handle_external_diameter = fields.Float('柄部外径(mm)') handle_inside_diameter = fields.Float('柄部内径(mm)') + dynamic_balance_class = fields.Char('动平衡等级') min_clamping_diameter = fields.Float('最小夹持直径(mm)') max_clamping_diameter = fields.Float('最大夹持直径(mm)') clamping_mode = fields.Char('夹持方式', size=20) max_load_capacity = fields.Float('最大负载能力(kg)') taper = fields.Integer('锥度(°)') + shank_length = fields.Float('刀柄长度(mm)', digits=(3, 2)) + shank_diameter = fields.Float('刀柄直径(mm)') tool_changing_time = fields.Integer('换刀时间(s)') standard_rotate_speed = fields.Integer('标准转速(n/min)') max_rotate_speed = fields.Integer('最大转速(n/min)') diameter_slip_accuracy = fields.Char('径跳精度(mm)', size=20) cooling_model = fields.Char('冷却类型', size=20) - is_rough_machining = fields.Boolean('可粗加工', default=False) - is_finish_machining = fields.Boolean('可精加工', default=False) + taper_shank_model = fields.Char('锥柄型号') is_quick_cutting = fields.Boolean('可高速切削', default=False) - is_drill_hole = fields.Boolean('可钻孔', default=False) is_safe_lock = fields.Boolean('有无安全锁', default=False) + chuck_id = fields.Many2one( + 'sf.cutting_tool.standard.library', + domain="[('cutting_tool_material_id.name', '=', '夹头')]", + string='适配夹头型号' # 使用空列表作为默认值 + ) + nut = fields.Char('适配锁紧螺母型号') + # 夹头参数 er_size_model = fields.Char('ER尺寸型号', size=20) outer_diameter = fields.Float('外径(mm)') @@ -118,179 +126,14 @@ class ToolMaterialsBasicParameters(models.Model): clamping_length = fields.Float('夹持长度(mm)') clamping_tolerance = fields.Char('夹持公差(mm)', size=20) cooling_jacket = fields.Char('适用冷却套型号', size=50) - handle_ids = fields.Many2many( - 'sf.cutting.tool.type', - relation='basic_param_chuck_handle_rel', - column1='model_id_1', - column2='model_id_2', - domain="[('cutting_tool_material_id.name', '=', '刀柄')]", - string='适用刀柄型号' - ) - - def _json_integral_tool_basic_param(self, obj): - integral_tool_basic_param_str = (0, '', { - 'name': obj['name'], - 'cutting_tool_type': obj['cutting_tool_type'], - 'total_length': obj['total_length'], - 'blade_diameter': obj['blade_diameter'], - 'blade_length': obj['blade_length'], - 'blade_number': obj['blade_number'], - 'neck_length': obj['neck_length'], - 'neck_diameter': obj['neck_diameter'], - 'handle_diameter': obj['handle_diameter'], - 'handle_length': obj['handle_length'], - 'blade_tip_diameter': obj['blade_tip_diameter'], - 'blade_tip_working_size': obj['blade_tip_working_size'], - 'blade_tip_taper': obj['blade_tip_taper'], - 'blade_helix_angle': obj['blade_helix_angle'], - 'blade_width': obj['blade_width'], - 'blade_depth': obj['blade_depth'], - 'pitch': obj['pitch'], - 'cutting_depth': obj['cutting_depth'], - }) - return integral_tool_basic_param_str - - def _json_blade_basic_param(self, obj): - blade_basic_param_str = (0, '', { - 'name': obj['name'], - 'cutting_tool_type': obj['cutting_tool_type'], - 'length': obj['length'], - 'thickness': obj['thickness'], - 'width': obj['width'], - 'cutting_blade_length': obj['cutting_blade_length'], - 'relief_angle': obj['relief_angle'], - 'blade_tip_circular_arc_radius': obj['blade_tip_circular_arc_radius'], - 'inscribed_circle_diameter': obj['inscribed_circle_diameter'], - 'install_aperture_diameter': obj['install_aperture_diameter'], - 'pitch': obj['pitch'], - 'chip_breaker_groove': obj['chip_breaker_groove'], - 'blade_teeth_model': '无' if not obj['bladed_teeth_model'] else obj['bladed_teeth_model'], - 'blade_blade_number': obj['blade_blade_number'], - 'cutting_depth': obj['cutting_depth'], - 'blade_width': obj['blade_width'], - 'main_included_angle': obj['main_included_angle'], - 'top_angle': obj['top_angle'], - 'blade_tip_dip_angle': obj['blade_tip_dip_angle'], - 'side_cutting_edge_angle': obj['side_cutting_edge_angle'], - 'thread_model': '无' if not obj['thread_model'] else obj['thread_model'], - 'thread_num': obj['thread_num'], - 'blade_tip_height_tolerance': obj['blade_tip_height_tolerance'], - 'inscribed_circle_tolerance': obj['inscribed_circle_tolerance'], - 'thickness_tolerance': obj['thickness_tolerance'], - }) - return blade_basic_param_str - - def _json_cutter_arbor_basic_param(self, obj): - cutter_arbor_basic_param_str = (0, '', { - 'name': obj['name'], - 'cutting_tool_type': obj['cutting_tool_type'], - 'height': obj['height'], - 'width': obj['width'], - 'total_length': obj['total_length'], - 'knife_head_height': obj['knife_head_height'], - 'knife_head_width': obj['knife_head_width'], - 'knife_head_length': obj['knife_head_length'], - 'cutter_arbor_diameter': obj['cutter_arbor_diameter'], - 'main_included_angle': obj['main_included_angle'], - 'relief_angle': obj['relief_angle'], - 'cutting_depth': obj['cutting_depth'], - 'min_machining_aperture': obj['min_machining_aperture'], - 'install_blade_tip_num': obj['install_blade_tip_num'], - 'cutting_blade_model': obj['cutting_blade_model'], - 'is_cooling_hole': obj['is_cooling_hole'], - 'locating_slot_code': obj['locating_slot_code'], - 'installing_structure': obj['installing_structure'], - 'blade_ids': [(6, 0, [])] if not obj.get('blade_codes') else - self.evn['sf.cutting_tool.standard.library']._get_ids(obj['blade_codes']), - 'tool_shim': obj['tool_shim'], - 'cotter_pin': obj['cotter_pin'], - 'pressing_plate': obj['pressing_plate'], - 'screw': obj['screw'], - 'spanner': obj['spanner'], - }) - return cutter_arbor_basic_param_str - - def _json_cutter_head_basic_param(self, obj): - cutter_head_basic_param_str = (0, '', { - 'name': obj['name'], - 'cutting_tool_type': obj['cutting_tool_type'], - 'install_blade_tip_num': obj['install_blade_tip_num'], - 'blade_diameter': obj['blade_diameter'], - 'cutter_head_diameter': obj['cutter_head_diameter'], - 'interface_diameter': obj['interface_diameter'], - 'total_length': obj['total_length'], - 'blade_length': obj['blade_length'], - 'cutting_depth': obj['cutting_depth'], - 'main_included_angle': obj['main_included_angle'], - 'installing_structure': obj['installing_structure'], - 'blade_ids': [(6, 0, [])] if not obj.get('blade_codes') else - self.evn['sf.cutting_tool.standard.library']._get_ids(obj['blade_codes']), - 'screw': obj['screw'], - 'spanner': obj['spanner'], - 'cutting_blade_model': obj['cutting_blade_model'], - 'is_cooling_hole': obj['is_cooling_hole'], - 'locating_slot_code': obj['locating_slot_code'], - }) - return cutter_head_basic_param_str - - def _json_knife_handle_basic_param(self, obj): - knife_handle_basic_param_str = (0, '', { - 'name': obj['name'], - 'cutting_tool_type': obj['cutting_tool_type'], - 'total_length': obj['total_length'], - 'flange_shank_length': obj['flange_shank_length'], - 'handle_external_diameter': obj['handle_external_diameter'], - 'handle_inside_diameter': obj['handle_inside_diameter'], - 'min_clamping_diameter': obj['min_clamping_diameter'], - 'max_clamping_diameter': obj['max_clamping_diameter'], - 'clamping_mode': obj['clamping_mode'], - 'max_load_capacity': obj['max_load_capacity'], - 'taper': obj['taper'], - 'tool_changing_time': obj['tool_changing_time'], - 'standard_rotate_speed': obj['standard_rotate_speed'], - 'max_rotate_speed': obj['max_rotate_speed'], - 'diameter_slip_accuracy': obj['diameter_slip_accuracy'], - 'cooling_model': obj['cooling_model'], - 'is_rough_machining': obj['is_rough_machining'], - 'is_finish_machining': obj['is_finish_machining'], - 'is_quick_cutting': obj['is_quick_cutting'], - 'is_drill_hole': obj['is_drill_hole'], - 'is_safe_lock': obj['is_safe_lock'], - 'screw': obj['screw'], - 'spanner': obj['spanner'], - }) - return knife_handle_basic_param_str - - def _json_chuck_basic_param(self, obj): - chuck_basic_param_str = (0, '', { - 'name': obj['name'], - 'cutting_tool_type': obj['cutting_tool_type'], - 'er_size_model': obj['er_size_model'], - 'min_clamping_diameter': obj['min_clamping_diameter'], - 'max_clamping_diameter': obj['max_clamping_diameter'], - 'outer_diameter': obj['outer_diameter'], - 'inner_diameter': obj['inner_diameter'], - 'run_out_accuracy': obj['run_out_accuracy'], - 'total_length': obj['total_length'], - 'taper': obj['taper'], - 'run_out_accuracy': obj['run_out_accuracy'], - 'top_diameter': obj['top_diameter'], - 'weight': obj['weight'], - 'clamping_mode': obj['clamping_mode'], - 'clamping_length': obj['clamping_length'], - 'clamping_tolerance': obj['clamping_tolerance'], - 'max_load_capacity': obj['max_load_capacity'], - 'handle_ids': [(6, 0, [])] if not obj.get( - 'handle_codes') else self.evn['sf.cutting_tool.standard.library']._get_ids(obj['handle_codes']), - 'cooling_jacket': obj['cooling_jacket'], - }) - return chuck_basic_param_str + active = fields.Boolean(string='有效', default=True) class CuttingSpeed(models.Model): _name = 'sf.cutting.speed' _description = '切削速度Vc' + name = fields.Char('名称') product_template_id = fields.Many2one('product.template') standard_library_id = fields.Many2one('sf.cutting_tool.standard.library', string='标准库') @@ -310,40 +153,7 @@ class CuttingSpeed(models.Model): cutting_speed_min = fields.Float('最小值') application = fields.Selection([('主应用', '主应用'), ('次应用', '次应用')], '主/次应用') - - # ===============待删除字段============== - material_id = fields.Many2one('sf.materials.model', '材料名称', - domain="[('standards_id', '=', execution_standard_id)]") - slope_milling_angle = fields.Integer('坡铣角度(°)') - cutting_speed_n1 = fields.Char('径向切宽 ae=100%D1 ap=1*D1 切削速度Vc') - cutting_speed_n2 = fields.Char('径向切宽 ae=50%D1 ap=1.5*D1 切削速度Vc') - cutting_speed_n3 = fields.Char('径向切宽 ae=25%D1 ap=L1max 切削速度Vc') - cutting_speed_n4 = fields.Char('径向切宽 ae=15%D1 ap=L1max 切削速度Vc') - cutting_speed_n5 = fields.Char('径向切宽 ae=5%D1 ap=L1max 切削速度Vc') - rough_machining = fields.Char('粗加工 Vc(m/min)') - precision_machining = fields.Char('精加工 Vc(m/min)') - - # ====================================== - - def _json_cutting_speed(self, obj): - cutting_speed_str = (0, '', { - 'execution_standard_id': self.env['sf.international.standards'].search( - [('code', '=', obj['execution_standard_code'])]).id, - 'material_code': obj['material_code'], - 'material_id': self.env['sf.materials.model'].search([('materials_no', '=', obj['material_name_code'])]).id, - 'material_grade': obj['material_grade'], - 'tensile_strength': obj['tensile_strength'], - 'hardness': obj['hardness'], - 'cutting_speed_n1': obj['cutting_speed_n1'], - 'cutting_speed_n2': obj['cutting_speed_n2'], - 'cutting_speed_n3': obj['cutting_speed_n3'], - 'cutting_speed_n4': obj['cutting_speed_n4'], - 'cutting_speed_n5': obj['cutting_speed_n5'], - 'rough_machining': obj['rough_machining'], - 'precision_machining': obj['precision_machining'], - 'application': obj['application'], - }) - return cutting_speed_str + active = fields.Boolean(string='有效', default=True) class FeedPerTooth(models.Model): @@ -351,52 +161,16 @@ class FeedPerTooth(models.Model): _description = '每齿走刀量fz' _order = 'blade_diameter,cutting_width_depth_id,materials_type_id' + name = fields.Char('名称') product_template_id = fields.Many2one('product.template') standard_library_id = fields.Many2one('sf.cutting_tool.standard.library', string='标准库') blade_diameter = fields.Integer('刃部直径(mm)', readonly=True) materials_type_id = fields.Many2one('sf.materials.model', string='材料名称', readonly=True) cutting_width_depth_id = fields.Many2one('sf.cutting.width.depth', '切削宽度和深度', readonly=True) feed_per_tooth = fields.Char('每齿走刀量 (mm/z)', size=20) + active = fields.Boolean(string='有效', default=True) - # =============待删除字段=========== - cutting_speed = fields.Char('径向切宽 ae(mm)') - machining_method = fields.Selection([('直铣', '直铣'), ('坡铣', '坡铣')], string='加工方式') - # ================================ - - def _json_feed_per_tooth(self, obj): - feed_per_tooth_str = (0, '', { - 'cutting_speed': obj['cutting_speed'], - 'blade_diameter': obj['blade_diameter'], - 'feed_per_tooth': obj['feed_per_tooth'], - }) - return feed_per_tooth_str - - def _json_feed_per_tooth_2(self, obj): - feed_per_tooth_2_str = (0, '', { - 'machining_method': obj['machining_method'], - 'materials_type_id': self.env['sf.materials.model'].search( - [('materials_no', '=', obj['materials_type_code'])]).id, - 'blade_diameter': obj['blade_diameter'], - 'feed_per_tooth': obj['feed_per_tooth'], - }) - return feed_per_tooth_2_str - - def _json_feed_per_tooth_3(self, obj): - feed_per_tooth_3_str = (0, '', { - 'cutting_speed': obj['cutting_speed'], - 'feed_per_tooth': obj['feed_per_tooth'], - }) - return feed_per_tooth_3_str - - def _json_feed_per_tooth_4(self, obj): - feed_per_tooth_4_str = (0, '', { - 'machining_method': obj['machining_method'], - 'materials_type_id': self.env['sf.materials.model'].search( - [('materials_no', '=', obj['materials_type_code'])]).id, - 'feed_per_tooth': obj['feed_per_tooth'], - }) - return feed_per_tooth_4_str # @api.depends('product_template_id') # def _compute_product_template_id(self): diff --git a/sf_base/views/tool_basic_param.xml b/sf_base/views/tool_basic_param.xml index dfe3eaf7..616905ca 100644 --- a/sf_base/views/tool_basic_param.xml +++ b/sf_base/views/tool_basic_param.xml @@ -46,8 +46,6 @@ - - @@ -73,7 +71,7 @@ - + diff --git a/sf_base/views/tool_views.xml b/sf_base/views/tool_views.xml index f189017d..f0e79d5f 100644 --- a/sf_base/views/tool_views.xml +++ b/sf_base/views/tool_views.xml @@ -157,6 +157,12 @@ + + - + @@ -223,7 +229,7 @@ - + @@ -234,24 +240,22 @@ - - - - - + + + + - + + + + - - - - @@ -262,29 +266,29 @@ - - - - - + + + + + - + + - - - - + + + @@ -299,13 +303,13 @@ - + + - + - @@ -316,27 +320,25 @@ + + + - - + + + - - - - - - + + + + + - - - - - - + + - - - - - @@ -380,7 +378,6 @@ - diff --git a/sf_dlm_management/static/js/changeCss.js b/sf_dlm_management/static/js/changeCss.js new file mode 100644 index 00000000..9510a207 --- /dev/null +++ b/sf_dlm_management/static/js/changeCss.js @@ -0,0 +1,35 @@ +// 因为表格可以拖动设置宽度，所以需要用js设置初始宽度 +function setBasicParamTableWidth() { + + + const basicParamDom = $('.fixTableCss') + let dom = [] + try { + dom = basicParamDom.find('table').find('thead').children().children() + + } catch { + dom = [] + } + if (!dom) return + dom.each(function () { + if ($(this).hasClass('row_no') >= 0) { // 序号列 + // 不设置 通过css设置 + } + const text = $(this).text() + $(this).find('span').removeClass('text-truncate') + if (text.length > 5) { + $(this).width('150px') + } else if (text.length == 5) { + $(this).width('100px') + } else if (text.length == 4) { + $(this).width('80px') + } else if (text.length == 3) { + $(this).width('65px') + } else if (text.length == 2) { + $(this).width('50px') + } + + }) +} + +setTimeout(setBasicParamTableWidth, 500) diff --git a/sf_dlm_management/views/product_template_management_view.xml b/sf_dlm_management/views/product_template_management_view.xml index 737d56db..94cb4b7f 100644 --- a/sf_dlm_management/views/product_template_management_view.xml +++ b/sf_dlm_management/views/product_template_management_view.xml @@ -7,7 +7,7 @@ - + + attrs="{'invisible': ['|',('categ_type', '!=', '坯料'),('categ_type', '=', False)],'readonly': [('id', '!=', False)]}"/> + attrs="{'invisible': [('categ_type', 'not in', ['成品','坯料', '原材料'])],'readonly': [('id', '!=', False)]}"/> + attrs="{'invisible': [('categ_type', 'not in', ['成品','坯料', '原材料'])],'readonly': [('id', '!=', False)]}"/> - - {'readonly': [('categ_id', '!=', False)]} - + - - - + product.template.only.form.inherit.sf product.template @@ -101,118 +99,105 @@ - + + + + + product.template.only.form.inherit.sf + product.template + + + + attrs="{'invisible': [('categ_type', '!=', '刀具')],'readonly': [('id', '!=', False)]}"> + placeholder="请选择" attrs="{'readonly': [('id', '!=', False)]}"/> + attrs="{'readonly': [('id', '!=', False)]}"/> + attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀杆','刀盘','夹头','刀柄'))],'readonly': [('id', '!=', False)]}"/> + attrs="{'readonly': [('id', '!=', False)]}"/> - + - + string="材质" attrs="{'readonly': [('id', '!=', False)]}"/> + + attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')],'readonly': [('id', '!=', False)]}"/> + attrs="{'required': [('cutting_tool_type','=','整体式刀具')],'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀片'))],'readonly': [('id', '!=', False)]}"/> + attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')],'readonly': [('id', '!=', False)]}"/> + attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')],'readonly': [('id', '!=', False)]}"/> + attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')],'readonly': [('id', '!=', False)]}"/> - + attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')],'readonly': [('id', '!=', False)]}"/> + + attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')],'readonly': [('id', '!=', False)]}"/> + attrs='{"invisible": [("cutting_tool_type","not in",("夹头","刀柄"))],"readonly": [("id", "!=", False)]}'/> + attrs="{'invisible': [('cutting_tool_type', 'not in', ('夹头','刀柄'))],'readonly': [('id', '!=', False)]}"/> + + + attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')],'readonly': [('id', '!=', False)]}"/> + attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀片'))],'readonly': [('id', '!=', False)]}"/> + attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀片','刀杆','刀盘'))],'readonly': [('id', '!=', False)]}"/> - - + attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀片'))],'readonly': [('id', '!=', False)]}"/> + attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')],'readonly': [('id', '!=', False)]}"/> - + attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')],'readonly': [('id', '!=', False)]}"/> + attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')],'readonly': [('id', '!=', False)]}"/> + attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')],'readonly': [('id', '!=', False)]}"/> + + attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')],'readonly': [('id', '!=', False)]}"/> + attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')],'readonly': [('id', '!=', False)]}"/> - - - + attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')],'readonly': [('id', '!=', False)]}"/> - - + attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')],'readonly': [('id', '!=', False)]}"/> + + attrs="{'invisible': [('cutting_tool_type', '!=', '夹头')],'readonly': [('id', '!=', False)]}"/> + attrs="{'invisible': [('cutting_tool_type', '!=', '夹头')],'readonly': [('id', '!=', False)]}"/> + attrs="{'invisible': [('cutting_tool_type', '!=', '夹头')],'readonly': [('id', '!=', False)]}"/> + attrs="{'invisible': [('cutting_tool_type', '!=', '夹头')],'readonly': [('id', '!=', False)]}"/> + attrs="{'invisible': [('cutting_tool_type', '!=', '夹头')],'readonly': [('id', '!=', False)]}"/> + attrs="{'invisible': [('cutting_tool_type', '!=', '刀杆')],'readonly': [('id', '!=', False)]}"/> + attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀盘'))],'readonly': [('id', '!=', False)]}"/> + attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀盘'))],'readonly': [('id', '!=', False)]}"/> - + attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀盘'))],'readonly': [('id', '!=', False)]}"/> + + attrs="{'invisible': [('cutting_tool_type', '!=', '刀杆')],'readonly': [('id', '!=', False)]}"/> + attrs="{'invisible': [('cutting_tool_type', '!=', '刀杆')],'readonly': [('id', '!=', False)]}"/> + attrs="{'invisible': [('cutting_tool_type', '!=', '刀杆')],'readonly': [('id', '!=', False)]}"/> + attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆'))],'readonly': [('id', '!=', False)]}"/> + + attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀柄'))],'readonly': [('id', '!=', False)]}"/> + + - - + + + attrs="{'readonly': [('id', '!=', False)]}"/> + attrs="{'readonly': [('id', '!=', False)]}"/> + attrs="{'readonly': [('id', '!=', False)]}"/> + attrs="{'readonly': [('id', '!=', False)]}"/> - + + attrs="{'readonly': [('id', '!=', False)]}"/> + attrs="{'readonly': [('id', '!=', False)]}" class="fixTableCss"> - - - - - - - - - + + attrs="{'readonly': [('id', '!=', False)]}"> - - - + + + @@ -483,64 +450,106 @@ - + - - - - - - - - - - + diff --git a/sf_maintenance/models/sf_maintenance.py b/sf_maintenance/models/sf_maintenance.py index b09fb373..97deb883 100644 --- a/sf_maintenance/models/sf_maintenance.py +++ b/sf_maintenance/models/sf_maintenance.py @@ -139,7 +139,7 @@ class SfMaintenanceEquipment(models.Model): record.equipment_type = record.category_id.equipment_type code = fields.Char('行业编码') - name = fields.Char('机台号') + name = fields.Char('机台号', required=False) knife_type = fields.Selection( [("BT40", "BT40"), ("BT30", "BT30"), ("BT50", "BT50")], default="", string="刀把类型") @@ -160,8 +160,9 @@ class SfMaintenanceEquipment(models.Model): type_id = fields.Many2one('sf.machine_tool.type', '型号') state = fields.Selection( - [("正常", "正常"), ("故障", "故障"), ("不可用", "不可用")], + [("正常", "正常"), ("故障停机", "故障停机"), ("计划维保", "计划维保"),("空闲", "空闲"),("封存(报废)", "封存(报废)")], default='正常', string="机床状态") + run_time = fields.Char('总运行时长') # 0606新增字段 machine_tool_picture = fields.Binary('图片') heightened_way = fields.Selection([ @@ -449,7 +450,7 @@ class SfMaintenanceEquipment(models.Model): sf_secret_key = sf_sync_config['sf_secret_key'] headers = Common.get_headers(self, token, sf_secret_key) strurl = sf_sync_config['sf_url'] + self.crea_url - objs_all = self.env['maintenance.equipment'].search([('MTcode', '=', self.MTcode)]) + objs_all = self.env['maintenance.equipment'].search([('id', '=', self.id)]) machine_tool_list = [] if objs_all: for item in objs_all: @@ -552,7 +553,7 @@ class SfMaintenanceEquipment(models.Model): kw = json.dumps(machine_tool_list, ensure_ascii=False) r = requests.post(strurl, json={}, data={'kw': kw, 'token': token}, headers=headers) ret = r.json() - self.code = ret['message'] + self.code = ret['data'] self.state_zc = "已注册" if r == 200: return "机床注册成功" diff --git a/sf_maintenance/models/sf_maintenance_logs.py b/sf_maintenance/models/sf_maintenance_logs.py index 5c798754..791f66f8 100644 --- a/sf_maintenance/models/sf_maintenance_logs.py +++ b/sf_maintenance/models/sf_maintenance_logs.py @@ -26,3 +26,4 @@ class SfMaintenanceLogs(models.Model): recovery_time = fields.Datetime(string='复原时间') fault_duration = fields.Float(string='故障时长') note = fields.Text(string='备注') + active = fields.Boolean('Active', default=True) diff --git a/sf_maintenance/security/ir.model.access.csv b/sf_maintenance/security/ir.model.access.csv index 54e54d01..8870c0ec 100644 --- a/sf_maintenance/security/ir.model.access.csv +++ b/sf_maintenance/security/ir.model.access.csv @@ -14,5 +14,4 @@ access_maintenance_standard_image_group_plan_dispatch,maintenance_standard_image access_equipment_maintenance_standards_group_plan_dispatch,equipment_maintenance_standards,model_equipment_maintenance_standards,sf_base.group_plan_dispatch,1,0,0,0 access_maintenance_standards_group_plan_dispatch,maintenance_standards,model_maintenance_standards,sf_base.group_plan_dispatch,1,0,0,0 -access_maintenance_equipment_tool_group_plan_dispatch,maintenance.equipment.tool,sf_manufacturing.model_maintenance_equipment_tool,sf_base.group_plan_dispatch,1,0,0,0 access_sf_robot_axis_num_group_plan_dispatch,sf.robot.axis.num,model_sf_robot_axis_num,sf_base.group_plan_dispatch,1,0,0,0 \ No newline at end of file diff --git a/sf_maintenance/views/maintenance_equipment_category_views.xml b/sf_maintenance/views/maintenance_equipment_category_views.xml index fa9c571c..2cdb47a3 100644 --- a/sf_maintenance/views/maintenance_equipment_category_views.xml +++ b/sf_maintenance/views/maintenance_equipment_category_views.xml @@ -18,7 +18,7 @@ - + diff --git a/sf_maintenance/views/maintenance_logs_views.xml b/sf_maintenance/views/maintenance_logs_views.xml index a4e8d605..b0d6af79 100644 --- a/sf_maintenance/views/maintenance_logs_views.xml +++ b/sf_maintenance/views/maintenance_logs_views.xml @@ -105,9 +105,10 @@ - 设备故障日志 + 设备故障日志 ir.actions.act_window sf.maintenance.logs + tree,form @@ -117,6 +118,23 @@ + + + + + + + + + + + + + + + + + diff --git a/sf_maintenance/views/maintenance_views.xml b/sf_maintenance/views/maintenance_views.xml index 5faa4a9c..5266bced 100644 --- a/sf_maintenance/views/maintenance_views.xml +++ b/sf_maintenance/views/maintenance_views.xml @@ -27,7 +27,7 @@ @@ -56,21 +56,22 @@ domain="[('brand_id', '=', brand_id)]"/> + - +