From 5ccd754261eefba2402029548555edf700d2c276 Mon Sep 17 00:00:00 2001 From: yuxianghui <1608204036@qq.com> Date: Tue, 29 Aug 2023 11:06:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=80=E6=9C=89=E8=87=AA=E5=BB=BA=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E6=97=A5=E5=BF=97=E8=AD=A6=E5=91=8A=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_base/models/fixture.py | 2 +- sf_base/models/tool_base_new.py | 2 +- sf_maintenance/views/maintenance_views.xml | 2 +- sf_plan_management/models/calendar_base.py | 2 +- sf_tool_management/models/base.py | 13 +- .../models/tool_material_search.py | 146 +++++++++--------- sf_tool_management/views/tool_base_views.xml | 2 +- .../views/tool_material_search.xml | 146 +++++++++--------- sf_tool_management/wizard/wizard.py | 11 +- sf_tool_management/wizard/wizard_view.xml | 2 +- 10 files changed, 164 insertions(+), 164 deletions(-) diff --git a/sf_base/models/fixture.py b/sf_base/models/fixture.py index c393237e..88a06d27 100644 --- a/sf_base/models/fixture.py +++ b/sf_base/models/fixture.py @@ -80,7 +80,7 @@ class FixtureModel(models.Model): code = self._get_code("JKM-C-JJWL-LDKP-") return code - @api.model + @api.model_create_multi def create(self, vals): obj = super(FixtureModel, self).create(vals) if obj.fixture_material_id: diff --git a/sf_base/models/tool_base_new.py b/sf_base/models/tool_base_new.py index 0a94430e..04b8338a 100644 --- a/sf_base/models/tool_base_new.py +++ b/sf_base/models/tool_base_new.py @@ -208,7 +208,7 @@ class CuttingToolModel(models.Model): code = self._get_code("JKM-T-DJWL-DBIN-") return code - @api.model + @api.model_create_multi def create(self, vals): obj = super(CuttingToolModel, self).create(vals) if obj.cutting_tool_material_id: diff --git a/sf_maintenance/views/maintenance_views.xml b/sf_maintenance/views/maintenance_views.xml index 8f835c4c..5ba2ab69 100644 --- a/sf_maintenance/views/maintenance_views.xml +++ b/sf_maintenance/views/maintenance_views.xml @@ -187,7 +187,7 @@ - + diff --git a/sf_plan_management/models/calendar_base.py b/sf_plan_management/models/calendar_base.py index 44e9d85c..6ac7772c 100644 --- a/sf_plan_management/models/calendar_base.py +++ b/sf_plan_management/models/calendar_base.py @@ -106,7 +106,7 @@ class WorkLogSetting(models.Model): # 'calendar_code': self.code, # 'date_time': target_date}) - @api.model + @api.model_create_multi def create(self, vals_list): """ 创建记录时,生成工作日历 diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py index 5fdd279c..65084310 100644 --- a/sf_tool_management/models/base.py +++ b/sf_tool_management/models/base.py @@ -16,10 +16,10 @@ class FunctionalCuttingToolEntity(models.Model): name = fields.Char('名称') mrs_cutting_tool_model_id = fields.Many2one('sf.cutting.tool.model', string='刀具型号') mrs_cutting_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', - group_expand='_read_group_mrs_cutting_tool_type_ids') + group_expand='_read_group_mrs_cutting_tool_type_id', compute_sudo=True) @api.model - def _read_group_mrs_cutting_tool_type_ids(self, categories, domain, order): + def _read_group_mrs_cutting_tool_type_id(self, categories, domain, order): mrs_cutting_tool_type_ids = categories._search([], order=order, access_rights_uid=SUPERUSER_ID) return categories.browse(mrs_cutting_tool_type_ids) @@ -65,7 +65,6 @@ class FunctionalCuttingToolEntity(models.Model): # record.mrs_cutting_tool_cutterbar_model_ids = None # record.mrs_cutting_tool_cutterpad_model_ids = None - diameter = fields.Float('直径(mm)') tool_grade = fields.Selection([('1', 'P1'), ('2', 'P2'), ('3', 'P3'), ('4', 'P4'), ('5', 'P5'), ('6', 'P6')], string='刀具等级') @@ -282,7 +281,7 @@ class RealTimeDistributionOfFunctionalTools(models.Model): mrs_cutting_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=True, group_expand='_read_mrs_cutting_tool_type_ids', store=True, - compute='_compute_functional_cutting_tool_id') + compute='_compute_functional_cutting_tool_ids') @api.model def _read_mrs_cutting_tool_type_ids(self, categories, domain, order): @@ -290,7 +289,7 @@ class RealTimeDistributionOfFunctionalTools(models.Model): return categories.browse(mrs_cutting_tool_type_ids) @api.depends('functional_cutting_tool_id') - def _compute_functional_cutting_tool_id(self): + def _compute_functional_cutting_tool_ids(self): for record in self: if record: record.mrs_cutting_tool_type_id = record.functional_cutting_tool_id.mrs_cutting_tool_type_id.id @@ -412,7 +411,7 @@ class InboundAndOutboundRecordsOfFunctionalTools(models.Model): mrs_cutting_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=True, group_expand='_read_mrs_cutting_tool_type_ids', store=True, - compute='_compute_functional_cutting_tool_id') + compute='_compute_functional_cutting_tool_ids') @api.model def _read_mrs_cutting_tool_type_ids(self, categories, domain, order): @@ -420,7 +419,7 @@ class InboundAndOutboundRecordsOfFunctionalTools(models.Model): return categories.browse(mrs_cutting_tool_type_ids) @api.depends('functional_cutting_tool_id') - def _compute_functional_cutting_tool_id(self): + def _compute_functional_cutting_tool_ids(self): for record in self: if record: record.mrs_cutting_tool_type_id = record.functional_cutting_tool_id.mrs_cutting_tool_type_id.id diff --git a/sf_tool_management/models/tool_material_search.py b/sf_tool_management/models/tool_material_search.py index cfbe489d..84044f1c 100644 --- a/sf_tool_management/models/tool_material_search.py +++ b/sf_tool_management/models/tool_material_search.py @@ -40,19 +40,19 @@ class SfToolMaterialSearch(models.Model): # 刀片特有字段 blade_code = fields.Char('刀片编码', readonly=True) - blade_length = fields.Float('长度L(mm)') - blade_width = fields.Float('宽度D(mm)') - blade_height = fields.Float('高度T(mm)') - blade_top_angle = fields.Float('顶角(°)') - blade_front_angle = fields.Float('前角(°)') - blade_rear_angle = fields.Float('后角(°)') - blade_main_included_angle = fields.Float('主偏角(°)') - blade_r_angle = fields.Float('R角(°)') - blade_hardness = fields.Char('加工硬度') - blade_accuracy = fields.Char('精度等级') - blade_coating_material_id = fields.Char('涂层材质') - blade_radius = fields.Float('刀尖半径(mm)') - blade_nut = fields.Float('配对螺母(mm)') + blade_length = fields.Float('刀片长度L(mm)') + blade_width = fields.Float('刀片宽度D(mm)') + blade_height = fields.Float('刀片高度T(mm)') + blade_top_angle = fields.Float('刀片顶角(°)') + blade_front_angle = fields.Float('刀片前角(°)') + blade_rear_angle = fields.Float('刀片后角(°)') + blade_main_included_angle = fields.Float('刀片主偏角(°)') + blade_r_angle = fields.Float('刀片R角(°)') + blade_hardness = fields.Char('刀片加工硬度') + blade_accuracy = fields.Char('刀片精度等级') + blade_coating_material_id = fields.Char('刀片涂层材质') + blade_radius = fields.Float('刀片刀尖半径(mm)') + blade_nut = fields.Float('刀片配对螺母(mm)') mrs_cutting_tool_model_blade_cutter_bar_ids = fields.Many2many( 'sf.cutting.tool.model', relation='sf_tool_material_search_blade_cutter_bar_rel', @@ -74,79 +74,79 @@ class SfToolMaterialSearch(models.Model): # 整体式刀具特有字段 integral_code = fields.Char('整体式刀具编码', readonly=True) - integral_total_length = fields.Float('总长度(mm)') - integral_shank_length = fields.Float('柄部长度(mm)') - integral_blade_length = fields.Float('刃部长度(mm)') - integral_diameter = fields.Float('直径(mm)') - integral_blade_number = fields.Integer('刃数') - integral_front_angle = fields.Float('前角(°)') - integral_rear_angle = fields.Float('后角(°)') - integral_main_included_angle = fields.Float('主偏角(°)') - integral_accuracy = fields.Float('精度等级') - integral_hardness = fields.Float('加工硬度(HRC)') - integral_coating_material = fields.Char('涂层材质') - integral_nut = fields.Float('配对螺母(mm)') - integral_scope = fields.Char('适用范围') + integral_total_length = fields.Float('整体式刀具总长度(mm)') + integral_shank_length = fields.Float('整体式刀具柄部长度(mm)') + integral_blade_length = fields.Float('整体式刀具刃部长度(mm)') + integral_diameter = fields.Float('整体式刀具直径(mm)') + integral_blade_number = fields.Integer('整体式刀具刃数') + integral_front_angle = fields.Float('整体式刀具前角(°)') + integral_rear_angle = fields.Float('整体式刀具后角(°)') + integral_main_included_angle = fields.Float('整体式刀具主偏角(°)') + integral_accuracy = fields.Float('整体式刀具精度等级') + integral_hardness = fields.Float('整体式刀具加工硬度(HRC)') + integral_coating_material = fields.Char('整体式刀具涂层材质') + integral_nut = fields.Float('整体式刀具配对螺母(mm)') + integral_scope = fields.Char('整体式刀具适用范围') # 刀杆特有字段 bar_code = fields.Char('刀杆编码', readonly=True) # bar_name = fields.Char('刀杆名称', required=True) - bar_c_diameter = fields.Float('C柄径(mm)') - bar_total_length = fields.Float('L总长(mm)') - bar_blade_number = fields.Integer('刃数') - bar_d_diameter = fields.Float('D刃径(mm)') + bar_c_diameter = fields.Float('刀杆C柄径(mm)') + bar_total_length = fields.Float('刀杆L总长(mm)') + bar_blade_number = fields.Integer('刀杆刃数') + bar_d_diameter = fields.Float('刀杆D刃径(mm)') mrs_cutting_tool_model_bar_blade_ids = fields.Many2many( 'sf.cutting.tool.model', relation='sf_tool_material_search_bar_blade_rel', column1='model_id_1', column2='model_id_2', domain="[('cutting_tool_type', '=', '刀片')]", - string='适用刀片型号' + string='刀杆适用刀片型号' ) - bar_wrench = fields.Float('配对扳手(mm)') - bar_screw = fields.Float('配备螺丝(mm)') - bar_radius = fields.Float('刀尖圆角半径') - bar_accuracy = fields.Char('精度等级') - bar_hardness = fields.Char('硬度(°)') - bar_scope = fields.Char('适用范围') + bar_wrench = fields.Float('刀杆配对扳手(mm)') + bar_screw = fields.Float('刀杆配备螺丝(mm)') + bar_radius = fields.Float('刀杆刀尖圆角半径') + bar_accuracy = fields.Char('刀杆精度等级') + bar_hardness = fields.Char('刀杆硬度(°)') + bar_scope = fields.Char('刀杆适用范围') # 刀盘特有字段 pad_code = fields.Char('刀盘编码', readonly=True) # pad_name = fields.Char('刀盘名称', required=True) - pad_c_diameter = fields.Float('C柄径(mm)') - pad_total_length = fields.Float('L总长(mm)') - pad_blade_number = fields.Integer('刃数') - pad_d_diameter = fields.Float('D刃径(mm)') + pad_c_diameter = fields.Float('刀盘C柄径(mm)') + pad_total_length = fields.Float('刀盘L总长(mm)') + pad_blade_number = fields.Integer('刀盘刃数') + pad_d_diameter = fields.Float('刀盘D刃径(mm)') mrs_cutting_tool_model_pad_blade_ids = fields.Many2many( 'sf.cutting.tool.model', relation='sf_tool_material_search_pad_blade_rel', column1='model_id_1', column2='model_id_2', domain="[('cutting_tool_type', '=', '刀片')]", - string='适用刀片型号' + string='刀盘适用刀片型号' ) - pad_wrench = fields.Float('配对扳手(mm)') - pad_screw = fields.Float('配备螺丝(mm)') - pad_radius = fields.Float('刀尖圆角半径') - pad_accuracy = fields.Char('精度等级') - pad_hardness = fields.Char('硬度(°)') - pad_scope = fields.Char('适用范围') + pad_wrench = fields.Float('刀盘配对扳手(mm)') + pad_screw = fields.Float('刀盘配备螺丝(mm)') + pad_radius = fields.Float('刀盘刀尖圆角半径') + pad_accuracy = fields.Char('刀盘精度等级') + pad_hardness = fields.Char('刀盘硬度(°)') + pad_scope = fields.Char('刀盘适用范围') # 刀柄特有字段 handle_code = fields.Char('刀柄编码', readonly=True) # 柄长L(mm)、法兰柄长L1(mm)、法兰直径D1(mm) - handle_length = fields.Float('柄长L(mm)') - handle_diameter = fields.Float('直径D(mm)') - handle_flange_length = fields.Float('法兰柄长L1(mm)') - handle_flange_diameter = fields.Float('法兰直径D1(mm)') + handle_length = fields.Float('刀柄柄长L(mm)') + handle_diameter = fields.Float('刀柄直径D(mm)') + handle_flange_length = fields.Float('刀柄法兰柄长L1(mm)') + handle_flange_diameter = fields.Float('刀柄法兰直径D1(mm)') # 夹持直径min、夹持直径max、径跳精度、最大转速n/min、3D模型图 - handle_clamping_diameter_min = fields.Float('夹持直径min') - handle_clamping_diameter_max = fields.Float('夹持直径max') - handle_jump_accuracy = fields.Float('径跳精度') - handle_max_speed = fields.Float('最大转速n/min') - handle_weight = fields.Float('重量(kg)') - handle_body_accuracy = fields.Float('本体精度(mm)') - handle_nut = fields.Float('配对螺母(mm)') + handle_clamping_diameter_min = fields.Float('刀柄夹持直径min') + handle_clamping_diameter_max = fields.Float('刀柄夹持直径max') + handle_jump_accuracy = fields.Float('刀柄径跳精度') + handle_max_speed = fields.Float('刀柄最大转速n/min') + handle_weight = fields.Float('刀柄重量(kg)') + handle_body_accuracy = fields.Float('刀柄本体精度(mm)') + handle_nut = fields.Float('刀柄配对螺母(mm)') mrs_cutting_tool_model_handle_chuck_model_ids = fields.Many2many( 'sf.cutting.tool.model', relation='sf_tool_material_search_handle_chuck_rel', @@ -155,22 +155,22 @@ class SfToolMaterialSearch(models.Model): domain="[('cutting_tool_type', '=', '夹头')]", string='适用夹头型号' ) - handle_clamping_range = fields.Float('夹持范围(mm)') - handle_detection_accuracy = fields.Float('检测精度') - handle_detection_hardness = fields.Char('检测硬度') - handle_standard_speed = fields.Float('标准转速') + handle_clamping_range = fields.Float('刀柄夹持范围(mm)') + handle_detection_accuracy = fields.Float('刀柄检测精度') + handle_detection_hardness = fields.Char('刀柄检测硬度') + handle_standard_speed = fields.Float('刀柄标准转速') # 夹头特有字段 chuck_code = fields.Char('夹头编码', readonly=True) # chuck_name = fields.Char('夹头名称', required=True) - chuck_accuracy = fields.Float('精度(mm)') + chuck_accuracy = fields.Float('夹头精度(mm)') # 夹持直径min、夹持直径max、3D模型图 - chuck_clamping_diameter_min = fields.Float('夹持直径min') - chuck_clamping_diameter_max = fields.Float('夹持直径max') - chuck_diameter = fields.Float('外径(mm)') - chuck_inner_diameter = fields.Float('内径(mm)') - chuck_height = fields.Float('高度(mm)') - chuck_nut = fields.Float('配对螺母(mm)') + chuck_clamping_diameter_min = fields.Float('夹头夹持直径min(mm)') + chuck_clamping_diameter_max = fields.Float('夹头夹持直径max(mm)') + chuck_diameter = fields.Float('夹头外径(mm)') + chuck_inner_diameter = fields.Float('夹头内径(mm)') + chuck_height = fields.Float('夹头高度(mm)') + chuck_nut = fields.Float('夹头配对螺母(mm)') mrs_cutting_tool_model_chuck_handle_model_ids = fields.Many2many( 'sf.cutting.tool.model', relation='sf_tool_material_search_chuck_handle_rel', @@ -179,9 +179,9 @@ class SfToolMaterialSearch(models.Model): domain="[('cutting_tool_type', '=', '刀柄')]", string='适用刀柄型号' ) - chuck_clamping_range = fields.Float('夹持范围(mm)') - chuck_feature = fields.Char('特性') - image = fields.Binary('图片') + chuck_clamping_range = fields.Float('夹头夹持范围(mm)') + chuck_feature = fields.Char('夹头特性') + image = fields.Binary('夹头图片') # 数量、采购入库日期、采购批次、供应商、仓库名称、库区、库位、3D模型 number = fields.Integer('数量') diff --git a/sf_tool_management/views/tool_base_views.xml b/sf_tool_management/views/tool_base_views.xml index d7254f4a..9ef36138 100644 --- a/sf_tool_management/views/tool_base_views.xml +++ b/sf_tool_management/views/tool_base_views.xml @@ -674,7 +674,7 @@ - + diff --git a/sf_tool_management/views/tool_material_search.xml b/sf_tool_management/views/tool_material_search.xml index 9e844bfd..c8e0a55c 100644 --- a/sf_tool_management/views/tool_material_search.xml +++ b/sf_tool_management/views/tool_material_search.xml @@ -168,22 +168,22 @@ - - - - - - - + + + + + + + - - - - - - + + + + + + @@ -192,21 +192,21 @@ - - - - - - + + + + + + - - - - - - - + + + + + + + @@ -214,19 +214,19 @@ - - - - - - + + + + + + - - - - - + + + + + @@ -234,19 +234,19 @@ - - - - - - + + + + + + - - - - - + + + + + @@ -254,23 +254,25 @@ - - - - - - - + + + + + + + + - - - - - - - + + + + + + + + @@ -278,19 +280,19 @@ - - - - - + + + + + - - - - - + + + + + diff --git a/sf_tool_management/wizard/wizard.py b/sf_tool_management/wizard/wizard.py index 901dcda5..88e179f3 100644 --- a/sf_tool_management/wizard/wizard.py +++ b/sf_tool_management/wizard/wizard.py @@ -91,7 +91,6 @@ class ToolTransferRequestInformation(models.TransientModel): cutter_spacing_code = fields.Char(string='刀位号', readonly=True) functional_tool_code = fields.Char(string='功能刀具编码', readonly=True) functional_tool_name_id = fields.Many2one('sf.functional.cutting.tool', string='功能刀具名称', readonly=True) - # todo 功能刀具类型为 Many2one functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=True) transfer_target = fields.Selection([('机台', '机台'), ('线边刀库', '线边刀库'), @@ -99,13 +98,13 @@ class ToolTransferRequestInformation(models.TransientModel): new_cnc_machine_table_id = fields.Many2one('sf.machine_tool', string='机床名称') new_machine_tool_code = fields.Char(string='机床号') - new_cutter_spacing_code = fields.Char(string='刀位号') + new_cutter_spacing_code = fields.Char(string='目标刀位号') - magazine_tool_warehouse_district = fields.Char(string='库区') - magazine_tool_warehouse_position = fields.Char(string='库位') + magazine_tool_warehouse_district = fields.Char(string='线边刀库库区') + magazine_tool_warehouse_position = fields.Char(string='线边刀库库位') - tool_room_warehouse_district = fields.Char(string='库区') - tool_room_warehouse_position = fields.Char(string='库位') + tool_room_warehouse_district = fields.Char(string='刀具房库区') + tool_room_warehouse_position = fields.Char(string='刀具房库位') def tool_transfer_apply(self): """ diff --git a/sf_tool_management/wizard/wizard_view.xml b/sf_tool_management/wizard/wizard_view.xml index 02e4a766..4e871807 100644 --- a/sf_tool_management/wizard/wizard_view.xml +++ b/sf_tool_management/wizard/wizard_view.xml @@ -89,7 +89,7 @@ - +