jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复产品模板中产品类别为刀具和夹具时，根据产品类别为刀具和夹具时，新增的page页面里的字段显示及回显Bug

Browse Source
This commit is contained in:
jinling.yang
2023-07-17 16:46:01 +08:00
parent 14283ab5e4
commit f68dce9ee2
9 changed files with 1215 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

178
sf_manufacturing/models/product_template.py
View File

@@ -46,19 +46,19 @@ class ResProductMo(models.Model):
)
brand_id = fields.Many2one('sf.machine.brand', '品牌')
tool_length = fields.Float('长度L[mm]')
tool_width = fields.Float('宽度D[mm])')
tool_height = fields.Float('高度T[mm]')
tool_weight = fields.Float('重量[kg]')
tool_length = fields.Integer('长度L[mm]', size=6)
tool_width = fields.Integer('宽度D[mm])', size=6)
tool_height = fields.Integer('高度T[mm]', size=6)
tool_weight = fields.Float('重量[kg]', size=4)
# 整体式刀具参数
cutting_tool_total_length = fields.Float('总长度[mm]')
cutting_tool_shank_length = fields.Float('柄部长度[mm]')
cutting_tool_blade_length = fields.Float('刃部长度[mm]')
cutting_tool_diameter = fields.Float('直径[mm]')
cutting_tool_blade_number = fields.Integer('刃数')
cutting_tool_front_angle = fields.Float('前角(°)')
cutting_tool_rear_angle = fields.Float('后角(°)')
cutting_tool_main_included_angle = fields.Float('主偏角(°)')
cutting_tool_front_angle = fields.Float('前角[°]')
cutting_tool_rear_angle = fields.Float('后角[°]')
cutting_tool_main_included_angle = fields.Float('主偏角[°]')
cutting_tool_material_model_id = fields.Many2one('sf.materials.model', '材料型号')
cutting_tool_nut = fields.Float('配对螺母[mm]')
# 适用夹头型号可以多选
@@ -72,8 +72,8 @@ class ResProductMo(models.Model):
cutting_tool_scope = fields.Char('适用范围')
# 刀片参数
cutting_tool_top_angle = fields.Float('顶角(°)')
cutting_tool_r_angle = fields.Float('R角(°)')
cutting_tool_top_angle = fields.Float('顶角[°]')
cutting_tool_r_angle = fields.Float('R角[°]')
cutting_tool_working_hardness = fields.Char('加工硬度')
cutting_tool_cutter_bar_ids = fields.Many2many(
'sf.cutting.tool.model',
@@ -108,7 +108,7 @@ class ResProductMo(models.Model):
cutting_tool_screw = fields.Float('配备螺丝[mm]')
cutting_tool_accuracy_level = fields.Char('精度等级')
cutting_tool_rounded_corner = fields.Float('刀尖圆角半径[mm]')
cutting_tool_hardness = fields.Char('硬度(°)')
cutting_tool_hardness = fields.Char('硬度[°]')
# 刀柄参数
cutting_tool_handle_length = fields.Float('L[mm]')
cutting_tool_length1 = fields.Float('L1[mm]')
@@ -140,14 +140,14 @@ class ResProductMo(models.Model):
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.Char(string="夹持工件长度MAX[mm]")
fixture_clamp_workpiece_width_max = fields.Char(string="夹持工件宽度MAX[mm]")
fixture_clamp_workpiece_height_max = fields.Char(string="夹持工件高度MAX[mm]")
fixture_clamp_workpiece_diameter_max = fields.Char(string="夹持工件直径MAX[mm]")
fixture_maximum_carrying_weight = fields.Char(string="最大承载重量[kg]")
fixture_maximum_clamping_force = fields.Char(string="最大夹持力[n]")
fixture_clamp_workpiece_length_max = fields.Integer(string="夹持工件长度MAX[mm]", size=6)
fixture_clamp_workpiece_width_max = fields.Integer(string="夹持工件宽度MAX[mm]", size=6)
fixture_clamp_workpiece_height_max = fields.Integer(string="夹持工件高度MAX[mm]", size=6)
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]", size=8)
fixture_driving_way = fields.Char(string="驱动方式")
fixture_apply_machine_tool_type = fields.Char(string="适用机床型号")
fixture_apply_machine_tool_type_id = fields.Many2one('sf.machine_tool.type', string="适用机床型号")
fixture_through_hole_size = fields.Integer(string="过孔大小[mm]", size=6)
fixture_screw_size = fields.Integer(string="螺牙大小[mm]", size=6)
@@ -163,127 +163,49 @@ class ResProductMo(models.Model):
def _onchange_categ_id(self):
if self.categ_type in ('刀具', '夹具'):
self.invoice_policy = 'delivery'
self.detailed_type = 'product'
self.sale_ok = False
@api.onchange('cutting_tool_material_id')
def _onchange_cutting_tool_material_id(self):
for item in self:
if item.cutting_tool_material_id.id != item.cutting_tool_model_id.mrs_cutting_tool_material_id.id:
item.cutting_tool_model_id = False
@api.onchange('fixture_material_id')
def _onchange_fixture_material_id(self):
for item in self:
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.cutting_tool_type == '整体式刀具':
item.brand_id = item.cutting_tool_model_id.mrs_machine_brand_id.id
item.cutting_tool_total_length = item.cutting_tool_model_id.integral_total_length
item.cutting_tool_shank_length = item.cutting_tool_model_id.integral_shank_length
item.cutting_tool_blade_length = item.cutting_tool_model_id.integral_blade_length
item.cutting_tool_diameter = item.cutting_tool_model_id.integral_diameter
item.cutting_tool_nut = item.cutting_tool_model_id.integral_nut
item.cutting_tool_blade_number = item.cutting_tool_model_id.integral_blade_number
item.cutting_tool_material_model_id = item.cutting_tool_model_id.mrs_materials_model_id.id
item.cutting_tool_front_angle = item.cutting_tool_model_id.integral_front_angle
item.cutting_tool_rear_angle = item.cutting_tool_model_id.integral_rear_angle
item.cutting_tool_main_included_angle = item.cutting_tool_model_id.integral_main_included_angle
item.cutting_tool_chuck_model_ids = self._get_ids(
item.cutting_tool_model_id.mrs_cutting_tool_model_handle_chuck_model_ids)
item.cutting_tool_scope = item.cutting_tool_model_id.integral_scope
item.image_1920 = '' if not item.cutting_tool_model_id.image else item.cutting_tool_model_id.image
elif self.cutting_tool_type == '刀片':
item.brand_id = item.cutting_tool_model_id.mrs_machine_brand_id.id
item.cutting_tool_top_angle = item.cutting_tool_model_id.blade_top_angle
item.cutting_tool_front_angle = item.cutting_tool_model_id.blade_front_angle
item.cutting_tool_rear_angle = item.cutting_tool_model_id.blade_rear_angle
item.cutting_tool_main_included_angle = item.cutting_tool_model_id.blade_main_included_angle
item.cutting_tool_r_angle = item.cutting_tool_model_id.blade_r_angle
item.cutting_tool_working_hardness = item.cutting_tool_model_id.blade_hardness
item.cutting_tool_material_model_id = item.cutting_tool_model_id.mrs_materials_model_id.id
item.tool_length = item.cutting_tool_model_id.blade_length
item.tool_width = item.cutting_tool_model_id.blade_width
item.tool_height = item.cutting_tool_model_id.blade_height
item.cutting_tool_radius = item.cutting_tool_model_id.blade_radius
item.cutting_tool_nut = item.cutting_tool_model_id.blade_nut
item.cutting_tool_cutter_bar_ids = self._get_ids(
item.cutting_tool_model_id.mrs_cutting_tool_model_blade_cutter_bar_ids)
item.cutting_tool_cutter_pad_ids = self._get_ids(
item.cutting_tool_model_id.mrs_cutting_tool_model_blade_cutter_pad_ids)
item.image_1920 = '' if not item.cutting_tool_model_id.image else item.cutting_tool_model_id.image
elif self.cutting_tool_type == '刀杆':
item.brand_id = item.cutting_tool_model_id.mrs_machine_brand_id.id
item.cutting_tool_c_diameter = item.cutting_tool_model_id.bar_c_diameter
item.cutting_tool_d_diameter = item.cutting_tool_model_id.bar_d_diameter
item.cutting_tool_l_total_length = item.cutting_tool_model_id.bar_total_length
item.cutting_tool_wrench = item.cutting_tool_model_id.bar_wrench
item.cutting_tool_screw = item.cutting_tool_model_id.bar_screw
item.cutting_tool_blade_ids = self._get_ids(
item.cutting_tool_model_id.mrs_cutting_tool_model_pad_blade_ids)
item.cutting_tool_scope = item.cutting_tool_model_id.bar_scope
item.cutting_tool_material_model_id = item.cutting_tool_model_id.mrs_materials_model_id.id
item.cutting_tool_rounded_corner = item.cutting_tool_model_id.bar_radius
item.cutting_tool_accuracy_level = item.cutting_tool_model_id.bar_accuracy
item.cutting_tool_blade_number = item.cutting_tool_model_id.bar_blade_number
item.cutting_tool_hardness = item.cutting_tool_model_id.bar_hardness
item.image_1920 = '' if not item.cutting_tool_model_id.image else item.cutting_tool_model_id.image
elif self.cutting_tool_type == '刀盘':
item.brand_id = item.cutting_tool_model_id.mrs_machine_brand_id.id
item.cutting_tool_c_diameter = item.cutting_tool_model_id.pad_c_diameter
item.cutting_tool_d_diameter = item.cutting_tool_model_id.pad_d_diameter
item.cutting_tool_l_total_length = item.cutting_tool_model_id.pad_total_length
item.cutting_tool_wrench = item.cutting_tool_model_id.pad_wrench
item.cutting_tool_screw = item.cutting_tool_model_id.pad_screw
item.cutting_tool_blade_ids = self._get_ids(
item.cutting_tool_model_id.mrs_cutting_tool_model_pad_blade_ids)
item.cutting_tool_scope = item.cutting_tool_model_id.pad_scope
item.cutting_tool_material_model_id = item.cutting_tool_model_id.mrs_materials_model_id.id
item.cutting_tool_rounded_corner = item.cutting_tool_model_id.pad_radius
item.cutting_tool_accuracy_level = item.cutting_tool_model_id.pad_accuracy
item.cutting_tool_blade_number = item.cutting_tool_model_id.pad_blade_number
item.cutting_tool_hardness = item.cutting_tool_model_id.pad_hardness
item.image_1920 = '' if not item.cutting_tool_model_id.image else item.cutting_tool_model_id.image
elif self.cutting_tool_type == '刀柄':
item.brand_id = item.cutting_tool_model_id.mrs_machine_brand_id.id
item.cutting_tool_handle_length = item.cutting_tool_model_id.handle_length
item.cutting_tool_length1 = item.cutting_tool_model_id.handle_length
item.cutting_tool_diameter1 = item.cutting_tool_model_id.handle_diameter
item.cutting_tool_body_accuracy = item.cutting_tool_model_id.handle_body_accuracy
item.cutting_tool_nut = item.cutting_tool_model_id.handle_nut
item.cutting_tool_clamping_range = item.cutting_tool_model_id.handle_clamping_range
item.tool_weight = item.cutting_tool_model_id.handle_weight
item.cutting_tool_material_model_id = item.cutting_tool_model_id.mrs_materials_model_id.id
item.cutting_tool_chuck_model_ids = self._get_ids(
item.cutting_tool_model_id.mrs_cutting_tool_model_handle_chuck_model_ids)
item.cutting_tool_detection_accuracy = item.cutting_tool_model_id.handle_detection_accuracy
item.cutting_tool_detection_hardness = item.cutting_tool_model_id.handle_detection_hardness
item.cutting_tool_standard_speed = item.cutting_tool_model_id.handle_standard_speed
item.image_1920 = '' if not item.cutting_tool_model_id.image else item.cutting_tool_model_id.image
elif self.cutting_tool_type == '夹头':
item.brand_id = item.cutting_tool_model_id.mrs_machine_brand_id.id
item.cutting_tool_outer_diameter = item.cutting_tool_model_id.chuck_diameter
item.cutting_tool_inner_diameter = item.cutting_tool_model_id.chuck_inner_diameter
item.cutting_tool_accuracy = item.cutting_tool_model_id.chuck_accuracy
item.cutting_tool_nut = item.cutting_tool_model_id.chuck_nut
item.cutting_tool_clamping_range = item.cutting_tool_model_id.chuck_clamping_range
item.cutting_tool_handle_model_ids = self._get_ids(
item.cutting_tool_model_id.mrs_cutting_tool_model_chuck_handle_model_ids)
item.cutting_tool_material_model_id = item.cutting_tool_model_id.mrs_materials_model_id.id
item.tool_height = item.cutting_tool_model_id.chuck_height
item.cutting_tool_feature = item.cutting_tool_model_id.chuck_feature
item.image_1920 = '' if not item.cutting_tool_model_id.image else item.cutting_tool_model_id.image
else:
item.brand_id = False
item.cutting_tool_total_length = False
item.cutting_tool_shank_length = False
item.cutting_tool_blade_length = False
item.cutting_tool_diameter = False
item.cutting_tool_nut = False
item.cutting_tool_blade_number = False
item.cutting_tool_material_model_id = False
item.cutting_tool_front_angle = False
item.cutting_tool_rear_angle = False
item.cutting_tool_main_included_angle = False
item.cutting_tool_chuck_model_ids = False
item.cutting_tool_scope = False
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_id = item.fixture_model_id.apply_machine_tool_type_id.id
@api.onchange('cutting_tool_model_id')
def _onchange_cutting_tool_model_id(self):