Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
This commit is contained in:
qihao.gong@jikimo.com
@@ -9,6 +9,7 @@ from . import mrp_routing_workcenter
|
||||
from . import stock
|
||||
from . import res_user
|
||||
from . import production_line_base
|
||||
from . import tool_other_features
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -339,7 +339,7 @@ class MrpProduction(models.Model):
|
||||
current_sequence += 1
|
||||
if work.name == '获取CNC加工程序':
|
||||
work.button_start()
|
||||
#work.fetchCNC()
|
||||
# work.fetchCNC()
|
||||
|
||||
# 创建工单并进行排序
|
||||
def _create_workorder(self):
|
||||
|
||||
@@ -25,7 +25,6 @@ class ResProductMo(models.Model):
|
||||
# if record:
|
||||
# record.categ_type = record.categ_id.type
|
||||
|
||||
|
||||
categ_type = fields.Selection(string='产品的类别', related='categ_id.type', store=True)
|
||||
|
||||
model_name = fields.Char('模型名称')
|
||||
@@ -63,26 +62,132 @@ class ResProductMo(models.Model):
|
||||
|
||||
cutting_tool_model_id = fields.Many2one('sf.cutting.tool.model', string='型号',
|
||||
)
|
||||
cutting_tool_type_id = fields.Many2one('sf.cutting.tool.type', string='刀具类型',
|
||||
cutting_tool_type_id = fields.Many2one('sf.cutting.tool.type', string='类型',
|
||||
domain="[('cutting_tool_material_id.name', '=', cutting_tool_type)]")
|
||||
|
||||
brand_id = fields.Many2one('sf.machine.brand', '品牌')
|
||||
tool_length = fields.Integer('长度(mm)')
|
||||
tool_width = fields.Integer('宽度(mm)')
|
||||
tool_height = fields.Integer('高度(mm)')
|
||||
tool_length = fields.Float('长度(mm)')
|
||||
tool_width = fields.Float('宽度(mm)')
|
||||
tool_height = fields.Float('高度(mm)')
|
||||
tool_thickness = fields.Integer('厚度(mm)')
|
||||
tool_weight = fields.Float('重量(kg)')
|
||||
tool_hardness = fields.Integer('硬度(hrc)')
|
||||
|
||||
coating_material = fields.Char('涂层材质')
|
||||
# 整体式刀具参数
|
||||
cutting_tool_total_length = fields.Float('总长度(mm)')
|
||||
cutting_tool_shank_length = fields.Float('柄部长度(mm)')
|
||||
cutting_tool_blade_length = fields.Float('刃部长度(mm)')
|
||||
# 整体式刀具特有字段
|
||||
cutting_tool_total_length = fields.Float('总长度(mm)', digits=(6, 1))
|
||||
cutting_tool_shank_length = fields.Float('柄部长度(mm)', digits=(6, 1))
|
||||
cutting_tool_blade_length = fields.Float('刃部长度(mm)', digits=(6, 1))
|
||||
cutting_tool_blade_number = fields.Selection(
|
||||
[('2', '2'), ('3', '3'), ('4', '4'), ('5', '5'), ('6', '6'), ('7', '7'), ('8', '8')], '刃数(个)')
|
||||
# 整体式刀具新增字段
|
||||
cutting_tool_neck_length = fields.Float('颈部长度(mm)', digits=(6, 1))
|
||||
cutting_tool_neck_diameter = fields.Float('颈部直径(mm)', digits=(6, 1))
|
||||
cutting_tool_shank_diameter = fields.Float('柄部直径(mm)', digits=(6, 1))
|
||||
cutting_tool_blade_tip_diameter = fields.Float('刀尖直径(mm)', digits=(6, 1))
|
||||
cutting_tool_blade_tip_taper = fields.Integer('刀尖锥度(°)')
|
||||
cutting_tool_blade_helix_angle = fields.Integer('刃部螺旋角(°)')
|
||||
cutting_tool_blade_type = fields.Char('刃部类型')
|
||||
cutting_tool_coarse_medium_fine = fields.Selection([('粗', '粗'), ('中', '中'), ('精', '精')], '粗/中/精')
|
||||
cutting_tool_run_out_accuracy_max = fields.Float('端跳精度max', digits=(6, 1))
|
||||
cutting_tool_run_out_accuracy_min = fields.Float('端跳精度min', digits=(6, 1))
|
||||
suitable_machining_method_ids = fields.Many2many('sf.suitable.machining.method',
|
||||
'rel_suitable_machining_method_product_template', '适合加工方式')
|
||||
blade_tip_characteristics_ids = fields.Many2many('sf.blade.tip.characteristics',
|
||||
'rel_blade_tip_characteristics_product_template', '刀尖特征')
|
||||
handle_type_ids = fields.Many2many('sf.handle.type', 'rel_handle_type_product_template', '柄部类型')
|
||||
cutting_direction_ids = fields.Many2many('sf.cutting.direction', 'rel_cutting_direction_product_template',
|
||||
'走刀方向')
|
||||
suitable_coolant_ids = fields.Many2many('sf.suitable.coolant', 'rel_suitable_coolant_product_template',
|
||||
'适合冷却液')
|
||||
|
||||
# @api.constrains('suitable_machining_method_ids')
|
||||
# def _check_suitable_machining_method_ids(self):
|
||||
# for record in self:
|
||||
# if len(record.suitable_machining_method_ids) == 0 and self.cutting_tool_type == '整体式刀具':
|
||||
# raise ValidationError("适合加工方式不能为空!")
|
||||
#
|
||||
# @api.constrains('blade_tip_characteristics_ids')
|
||||
# def _check_blade_tip_characteristics_ids(self):
|
||||
# for record in self:
|
||||
# if len(record.blade_tip_characteristics_ids) == 0 and self.cutting_tool_type == '整体式刀具':
|
||||
# raise ValidationError("刀尖特征不能为空!")
|
||||
# if len(record.blade_tip_characteristics_ids) > 1 and self.cutting_tool_type == '整体式刀具':
|
||||
# raise ValidationError("刀尖特征只能单选!")
|
||||
#
|
||||
# @api.constrains('handle_type_ids')
|
||||
# def _check_handle_type_ids(self):
|
||||
# for record in self:
|
||||
# if len(record.handle_type_ids) == 0 and self.cutting_tool_type == '整体式刀具':
|
||||
# raise ValidationError("柄部类型不能为空!")
|
||||
# if len(record.handle_type_ids) > 1 and self.cutting_tool_type == '整体式刀具':
|
||||
# raise ValidationError("柄部类型只能单选!")
|
||||
#
|
||||
# @api.constrains('cutting_direction_ids')
|
||||
# def _check_cutting_direction_ids(self):
|
||||
# for record in self:
|
||||
# if len(record.cutting_direction_ids) == 0 and self.cutting_tool_type == '整体式刀具':
|
||||
# raise ValidationError("走刀方向不能为空!")
|
||||
#
|
||||
# @api.constrains('suitable_coolant_ids')
|
||||
# def _check_suitable_coolant_ids(self):
|
||||
# for record in self:
|
||||
# if not record.suitable_coolant_ids and self.cutting_tool_type == '整体式刀具':
|
||||
# raise ValidationError("适合冷却液不能为空!")
|
||||
#
|
||||
# @api.constrains('cutting_tool_total_length')
|
||||
# def _check_cutting_tool_total_length(self):
|
||||
# if self.cutting_tool_total_length <= 0 and self.cutting_tool_type == '整体式刀具':
|
||||
# raise ValidationError("总长度不能为0")
|
||||
#
|
||||
# @api.constrains('cutting_tool_shank_length')
|
||||
# def _check_cutting_tool_shank_length(self):
|
||||
# if self.cutting_tool_shank_length <= 0 and self.cutting_tool_type == '整体式刀具':
|
||||
# raise ValidationError("柄部长度不能为0")
|
||||
#
|
||||
# @api.constrains('cutting_tool_blade_length')
|
||||
# def _check_cutting_tool_blade_length(self):
|
||||
# if self.cutting_tool_blade_length <= 0 and self.cutting_tool_type == '整体式刀具':
|
||||
# raise ValidationError("刃部长度不能为0")
|
||||
#
|
||||
# @api.constrains('cutting_tool_blade_number')
|
||||
# def _check_cutting_tool_blade_number(self):
|
||||
# if self.cutting_tool_blade_number <= 0 and self.cutting_tool_type == '整体式刀具':
|
||||
# raise ValidationError("刃数不能为0")
|
||||
#
|
||||
# @api.constrains('integral_shank_diameter')
|
||||
# def _check_integral_shank_diameter(self):
|
||||
# if self.integral_shank_diameter <= 0 and self.cutting_tool_type == '整体式刀具':
|
||||
# raise ValidationError("柄部直径不能为0")
|
||||
#
|
||||
# @api.constrains('integral_blade_diameter')
|
||||
# def _check_integral_blade_diameter(self):
|
||||
# if self.integral_blade_diameter <= 0 and self.cutting_tool_type == '整体式刀具':
|
||||
# raise ValidationError("刃部直径不能为0")
|
||||
#
|
||||
# @api.constrains('integral_run_out_accuracy_min')
|
||||
# def _check_integral_blade_diameter(self):
|
||||
# if self.integral_run_out_accuracy_min <= 0 and self.cutting_tool_type == '整体式刀具':
|
||||
# raise ValidationError("端跳精度最小(min)不能为0")
|
||||
|
||||
cutting_speed_ids = fields.One2many('sf.cutting.speed', 'product_template_id', string='切削速度Vc')
|
||||
feed_per_tooth_ids = fields.One2many('sf.feed.per.tooth', 'product_template_id', string='每齿走刀量fz')
|
||||
|
||||
# @api.constrains('suitable_machining_method_ids')
|
||||
# def _check_suitable_machining_method_ids(self):
|
||||
# for record in self:
|
||||
# if len(record.suitable_machining_method_ids) == 0 and self.cutting_tool_type == '整体式刀具':
|
||||
# raise ValidationError("适合加工方式不能为空!")
|
||||
|
||||
# @api.constrains('integral_run_out_accuracy_max')
|
||||
# def _check_integral_run_out_accuracy_max(self):
|
||||
# if self.integral_run_out_accuracy_max <= 0 and self.cutting_tool_type == '整体式刀具':
|
||||
# raise ValidationError("端跳精度最大(max)不能为0")
|
||||
|
||||
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.Integer('前角(°)')
|
||||
cutting_tool_rear_angle = fields.Integer('后角(°)')
|
||||
cutting_tool_main_included_angle = fields.Integer('主偏角(°)')
|
||||
# cutting_tool_material_model_id = fields.Many2one('sf.materials.model', '材料型号')
|
||||
cutting_tool_nut = fields.Float('配对螺母(mm)')
|
||||
# 适用夹头型号可以多选
|
||||
@@ -94,8 +199,8 @@ class ResProductMo(models.Model):
|
||||
domain="[('cutting_tool_type', '=', '夹头')]",
|
||||
string='适用夹头型号')
|
||||
# 刀片参数
|
||||
cutting_tool_top_angle = fields.Float('顶角(°)')
|
||||
cutting_tool_jump_accuracy = fields.Float('径跳精度(um)')
|
||||
cutting_tool_top_angle = fields.Integer('顶角(°)')
|
||||
cutting_tool_jump_accuracy = fields.Float('径跳精度(mm)')
|
||||
cutting_tool_working_hardness = fields.Char('加工硬度(hrc)')
|
||||
cutting_tool_cutter_bar_ids = fields.Many2many(
|
||||
'sf.cutting.tool.model',
|
||||
@@ -114,7 +219,7 @@ class ResProductMo(models.Model):
|
||||
string='适用刀盘型号' # 使用空列表作为默认值
|
||||
)
|
||||
# 刀杆/参数
|
||||
cutting_tool_blade_diameter = fields.Float('刃径(mm)')
|
||||
cutting_tool_blade_diameter = fields.Float('刃径/刃部直径(mm)')
|
||||
cutting_tool_blade_ids = fields.Many2many(
|
||||
'sf.cutting.tool.model',
|
||||
relation='product_cutting_tool_model_pad_blade_rel',
|
||||
@@ -124,16 +229,41 @@ class ResProductMo(models.Model):
|
||||
string='适用刀片型号' # 使用空列表作为默认值
|
||||
)
|
||||
cutting_tool_wrench = fields.Float('配对扳手(mm)')
|
||||
cutting_tool_screw = fields.Float('配备螺丝(mm)')
|
||||
# cutting_tool_screw = fields.Float('配备螺丝(mm)')
|
||||
cutting_tool_accuracy_level = fields.Char('精度等级')
|
||||
# 刀柄参数
|
||||
cutting_tool_head_diameter = fields.Float('头部直径')
|
||||
cutting_tool_diameter_max = fields.Float('最大直径(mm)')
|
||||
cutting_tool_clamping_diameter = fields.Float('夹持直径(mm)')
|
||||
cutting_tool_flange_length = 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_dynamic_balance_class = fields.Char('动平衡等级')
|
||||
cutting_tool_change_time = fields.Integer('换刀时间(s)')
|
||||
cutting_tool_clamping_way = 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_body_accuracy = fields.Float('本体精度(mm)')
|
||||
apply_lock_nut_model = fields.Char('适用锁紧螺母型号')
|
||||
apply_lock_wrench_model = fields.Char('适用锁紧扳手型号')
|
||||
cutting_tool_detection_accuracy_max = fields.Float('最大检测精度(mm)')
|
||||
cutting_tool_detection_accuracy_min = fields.Float('最小检测精度(mm)')
|
||||
# 夹头参数
|
||||
cutting_tool_taper = fields.Integer('锥度(°)')
|
||||
cutting_tool_outer_diameter = fields.Float('外径(mm)')
|
||||
cutting_tool_inner_diameter = fields.Float('内径(mm)')
|
||||
cooling_suit_type_ids = fields.Char('适用冷却套型号')
|
||||
# cooling_suit_type_ids = fields.Many2many('冷却类型')
|
||||
cutting_tool_er_size_model = fields.Char('ER尺寸型号')
|
||||
cutting_tool_handle_ids = fields.Many2many(
|
||||
'sf.cutting.tool.model',
|
||||
relation='product_cutting_tool_model_chuck_handle_rel',
|
||||
@@ -312,84 +442,119 @@ class ResProductMo(models.Model):
|
||||
item.fixture_apply_machine_tool_type_ids = self._get_ids(
|
||||
item.fixture_model_id.apply_machine_tool_type_ids)
|
||||
|
||||
@api.onchange('cutting_tool_model_id')
|
||||
def _onchange_cutting_tool_model_id(self):
|
||||
for item in self:
|
||||
if self.cutting_tool_type is not False:
|
||||
item.brand_id = item.cutting_tool_model_id.brand_id.id
|
||||
item.cutting_tool_type_id = item.cutting_tool_model_id.cutting_tool_type_id.id
|
||||
item.tool_length = item.cutting_tool_model_id.tool_length
|
||||
item.tool_width = item.cutting_tool_model_id.tool_width
|
||||
item.tool_height = item.cutting_tool_model_id.tool_height
|
||||
item.tool_thickness = item.cutting_tool_model_id.tool_thickness
|
||||
item.tool_weight = item.cutting_tool_model_id.tool_weight
|
||||
item.coating_material = item.cutting_tool_model_id.coating_material
|
||||
item.cutting_tool_total_length = item.cutting_tool_model_id.total_length
|
||||
item.cutting_tool_shank_length = item.cutting_tool_model_id.shank_length
|
||||
item.cutting_tool_blade_length = item.cutting_tool_model_id.blade_length
|
||||
item.cutting_tool_diameter = item.cutting_tool_model_id.diameter
|
||||
item.cutting_tool_blade_number = item.cutting_tool_model_id.blade_number
|
||||
item.cutting_tool_front_angle = item.cutting_tool_model_id.front_angle
|
||||
item.cutting_tool_rear_angle = item.cutting_tool_model_id.rear_angle
|
||||
item.cutting_tool_main_included_angle = item.cutting_tool_model_id.main_included_angle
|
||||
item.materials_type_id = item.cutting_tool_model_id.material_model_id.id
|
||||
item.cutting_tool_nut = item.cutting_tool_model_id.nut
|
||||
item.cutting_tool_top_angle = item.cutting_tool_model_id.top_angle
|
||||
item.cutting_tool_jump_accuracy = item.cutting_tool_model_id.jump_accuracy
|
||||
item.cutting_tool_working_hardness = item.cutting_tool_model_id.working_hardness
|
||||
item.cutting_tool_blade_diameter = item.cutting_tool_model_id.blade_diameter
|
||||
item.cutting_tool_wrench = item.cutting_tool_model_id.wrench
|
||||
item.cutting_tool_screw = item.cutting_tool_model_id.screw
|
||||
item.cutting_tool_accuracy_level = item.cutting_tool_model_id.accuracy_level
|
||||
item.cutting_tool_diameter_max = item.cutting_tool_model_id.diameter_max
|
||||
item.cutting_tool_clamping_diameter = item.cutting_tool_model_id.clamping_diameter
|
||||
item.cutting_tool_flange_length = item.cutting_tool_model_id.flange_length
|
||||
item.cutting_tool_flange_diameter = item.cutting_tool_model_id.flange_diameter
|
||||
item.cutting_tool_outer_diameter = item.cutting_tool_model_id.outer_diameter
|
||||
item.cutting_tool_inner_diameter = item.cutting_tool_model_id.inner_diameter
|
||||
item.cutting_tool_chuck_ids = self._get_ids(item.cutting_tool_model_id.chuck_ids)
|
||||
item.cutting_tool_cutter_bar_ids = self._get_ids(item.cutting_tool_model_id.cutter_bar_ids)
|
||||
item.cutting_tool_cutter_pad_ids = self._get_ids(item.cutting_tool_model_id.cutter_pad_ids)
|
||||
item.cutting_tool_blade_ids = self._get_ids(item.cutting_tool_model_id.blade_ids)
|
||||
item.cutting_tool_handle_ids = self._get_ids(item.cutting_tool_model_id.handle_ids)
|
||||
else:
|
||||
item.brand_id = False
|
||||
item.cutting_tool_type_id = False
|
||||
item.brand_id = False
|
||||
item.tool_length = False
|
||||
item.tool_width = False
|
||||
item.tool_height = False
|
||||
item.tool_thickness = False
|
||||
item.tool_weight = False
|
||||
item.coating_material = 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_blade_number = False
|
||||
item.cutting_tool_front_angle = False
|
||||
item.cutting_tool_rear_angle = False
|
||||
item.cutting_tool_main_included_angle = False
|
||||
item.materials_type_id = False
|
||||
item.cutting_tool_nut = False
|
||||
item.cutting_tool_top_angle = False
|
||||
item.cutting_tool_jump_accuracy = False
|
||||
item.cutting_tool_working_hardness = False
|
||||
item.cutting_tool_blade_diameter = False
|
||||
item.cutting_tool_wrench = False
|
||||
item.cutting_tool_screw = False
|
||||
item.cutting_tool_accuracy_level = False
|
||||
item.cutting_tool_diameter_max = False
|
||||
item.cutting_tool_clamping_diameter = False
|
||||
item.cutting_tool_flange_length = False
|
||||
item.cutting_tool_flange_diameter = False
|
||||
item.cutting_tool_outer_diameter = False
|
||||
item.cutting_tool_inner_diameter = False
|
||||
item.cutting_tool_chuck_ids = False
|
||||
item.cutting_tool_cutter_bar_ids = False
|
||||
item.cutting_tool_cutter_pad_ids = False
|
||||
item.cutting_tool_blade_ids = False
|
||||
item.cutting_tool_handle_ids = False
|
||||
# @api.onchange('cutting_tool_model_id')
|
||||
# def _onchange_cutting_tool_model_id(self):
|
||||
# for item in self:
|
||||
# if self.cutting_tool_type is not False:
|
||||
# item.brand_id = item.cutting_tool_model_id.brand_id.id
|
||||
# item.cutting_tool_type_id = item.cutting_tool_model_id.cutting_tool_type_id.id
|
||||
# item.tool_length = item.cutting_tool_model_id.tool_length
|
||||
# item.tool_width = item.cutting_tool_model_id.tool_width
|
||||
# item.tool_height = item.cutting_tool_model_id.tool_height
|
||||
# item.tool_thickness = item.cutting_tool_model_id.tool_thickness
|
||||
# item.tool_weight = item.cutting_tool_model_id.tool_weight
|
||||
# item.coating_material = item.cutting_tool_model_id.coating_material
|
||||
# item.cutting_tool_total_length = item.cutting_tool_model_id.total_length
|
||||
# item.cutting_tool_shank_length = item.cutting_tool_model_id.shank_length
|
||||
# item.cutting_tool_neck_length = item.cutting_tool_model_id.cutting_tool_neck_length
|
||||
# item.cutting_tool_shank_diameter = item.cutting_tool_model_id.cutting_tool_shank_diameter
|
||||
# item.cutting_tool_blade_diameter = item.cutting_tool_model_id.cutting_tool_blade_diameter
|
||||
# item.cutting_tool_neck_diameter = item.cutting_tool_model_id.cutting_tool_neck_diameter
|
||||
# item.cutting_tool_blade_tip_diameter = item.cutting_tool_model_id.cutting_tool_blade_tip_diameter
|
||||
# item.cutting_tool_blade_tip_taper = item.cutting_tool_model_id.cutting_tool_blade_tip_taper
|
||||
# item.cutting_tool_blade_helix_angle = item.cutting_tool_model_id.cutting_tool_blade_helix_angle
|
||||
# item.cutting_tool_blade_type = item.cutting_tool_model_id.cutting_tool_blade_type
|
||||
# item.cutting_tool_coarse_medium_fine = item.cutting_tool_model_id.cutting_tool_coarse_medium_fine
|
||||
# item.tool_hardness = item.cutting_tool_model_id.tool_hardness
|
||||
# item.cutting_tool_run_out_accuracy_max = item.cutting_tool_model_id.cutting_tool_run_out_accuracy_max
|
||||
# item.cutting_tool_run_out_accuracy_min = item.cutting_tool_model_id.cutting_tool_run_out_accuracy_min
|
||||
# item.suitable_machining_method_ids = self._get_ids(
|
||||
# item.cutting_tool_model_id.suitable_machining_method_ids)
|
||||
# item.blade_tip_characteristics_ids = self._get_ids(
|
||||
# item.cutting_tool_model_id.blade_tip_characteristics_ids)
|
||||
# item.handle_type_ids = self._get_ids(item.cutting_tool_model_id.handle_type_ids)
|
||||
# item.cutting_direction_ids = self._get_ids(item.cutting_tool_model_id.cutting_direction_ids)
|
||||
# item.suitable_coolant_ids = self._get_ids(item.cutting_tool_model_id.suitable_coolant_ids)
|
||||
# item.cutting_tool_diameter = item.cutting_tool_model_id.diameter
|
||||
# item.cutting_tool_blade_number = item.cutting_tool_model_id.blade_number
|
||||
# item.cutting_tool_front_angle = item.cutting_tool_model_id.front_angle
|
||||
# item.cutting_tool_rear_angle = item.cutting_tool_model_id.rear_angle
|
||||
# item.cutting_tool_main_included_angle = item.cutting_tool_model_id.main_included_angle
|
||||
# item.materials_type_id = item.cutting_tool_model_id.material_model_id.id
|
||||
# item.cutting_tool_nut = item.cutting_tool_model_id.nut
|
||||
# item.cutting_tool_top_angle = item.cutting_tool_model_id.top_angle
|
||||
# item.cutting_tool_jump_accuracy = item.cutting_tool_model_id.jump_accuracy
|
||||
# item.cutting_tool_working_hardness = item.cutting_tool_model_id.working_hardness
|
||||
# item.cutting_tool_blade_diameter = item.cutting_tool_model_id.blade_diameter
|
||||
# item.cutting_tool_wrench = item.cutting_tool_model_id.wrench
|
||||
# # item.cutting_tool_screw = item.cutting_tool_model_id.screw
|
||||
# item.cutting_tool_accuracy_level = item.cutting_tool_model_id.accuracy_level
|
||||
# item.cutting_tool_diameter_max = item.cutting_tool_model_id.diameter_max
|
||||
# item.cutting_tool_clamping_diameter = item.cutting_tool_model_id.clamping_diameter
|
||||
# item.cutting_tool_flange_length = item.cutting_tool_model_id.flange_length
|
||||
# item.cutting_tool_flange_diameter = item.cutting_tool_model_id.flange_diameter
|
||||
# item.cutting_tool_outer_diameter = item.cutting_tool_model_id.outer_diameter
|
||||
# item.cutting_tool_inner_diameter = item.cutting_tool_model_id.inner_diameter
|
||||
# item.cutting_tool_chuck_ids = self._get_ids(item.cutting_tool_model_id.chuck_ids)
|
||||
# item.cutting_tool_cutter_bar_ids = self._get_ids(item.cutting_tool_model_id.cutter_bar_ids)
|
||||
# item.cutting_tool_cutter_pad_ids = self._get_ids(item.cutting_tool_model_id.cutter_pad_ids)
|
||||
# item.cutting_tool_blade_ids = self._get_ids(item.cutting_tool_model_id.blade_ids)
|
||||
# item.cutting_tool_handle_ids = self._get_ids(item.cutting_tool_model_id.handle_ids)
|
||||
# else:
|
||||
# item.brand_id = False
|
||||
# item.cutting_tool_type_id = False
|
||||
# item.brand_id = False
|
||||
# item.tool_length = False
|
||||
# item.tool_width = False
|
||||
# item.tool_height = False
|
||||
# item.tool_thickness = False
|
||||
# item.tool_weight = False
|
||||
# item.coating_material = False
|
||||
# item.cutting_tool_total_length = False
|
||||
# item.cutting_tool_shank_length = False
|
||||
# item.cutting_tool_blade_length = False
|
||||
# item.cutting_tool_neck_length = False
|
||||
# item.cutting_tool_shank_diameter = False
|
||||
# item.cutting_tool_blade_diameter = False
|
||||
# item.cutting_tool_neck_diameter = False
|
||||
# item.cutting_tool_blade_tip_diameter = False
|
||||
# item.cutting_tool_blade_tip_taper = False
|
||||
# item.cutting_tool_blade_helix_angle = False
|
||||
# item.cutting_tool_blade_type = False
|
||||
# item.cutting_tool_coarse_medium_fine = False
|
||||
# item.tool_hardness = False
|
||||
# item.cutting_tool_run_out_accuracy_max = False
|
||||
# item.cutting_tool_run_out_accuracy_min = False
|
||||
# item.suitable_machining_method_ids = False
|
||||
# item.blade_tip_characteristics_ids = False
|
||||
# item.handle_type_ids = False
|
||||
# item.cutting_direction_ids = False
|
||||
# item.suitable_coolant_ids = False
|
||||
# item.cutting_tool_diameter = False
|
||||
# item.cutting_tool_blade_number = False
|
||||
# item.cutting_tool_front_angle = False
|
||||
# item.cutting_tool_rear_angle = False
|
||||
# item.cutting_tool_main_included_angle = False
|
||||
# item.materials_type_id = False
|
||||
# item.cutting_tool_nut = False
|
||||
# item.cutting_tool_top_angle = False
|
||||
# item.cutting_tool_jump_accuracy = False
|
||||
# item.cutting_tool_working_hardness = False
|
||||
# item.cutting_tool_blade_diameter = False
|
||||
# item.cutting_tool_wrench = False
|
||||
# # item.cutting_tool_screw = False
|
||||
# item.cutting_tool_accuracy_level = False
|
||||
# item.cutting_tool_diameter_max = False
|
||||
# item.cutting_tool_clamping_diameter = False
|
||||
# item.cutting_tool_flange_length = False
|
||||
# item.cutting_tool_flange_diameter = False
|
||||
# item.cutting_tool_outer_diameter = False
|
||||
# item.cutting_tool_inner_diameter = False
|
||||
# item.cutting_tool_chuck_ids = False
|
||||
# item.cutting_tool_cutter_bar_ids = False
|
||||
# item.cutting_tool_cutter_pad_ids = False
|
||||
# item.cutting_tool_blade_ids = False
|
||||
# item.cutting_tool_handle_ids = False
|
||||
|
||||
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')
|
||||
@@ -597,8 +762,7 @@ class ResMrpBomMo(models.Model):
|
||||
}
|
||||
return self.env['mrp.bom.line'].create(vals)
|
||||
|
||||
# 业务平台分配工厂后在智能工厂先创建销售订单再创建该产品后再次进行创建bom
|
||||
|
||||
# 业务平台分配工厂后在智能工厂先创建销售订单再创建该产品后再次进行创建bom
|
||||
def bom_create(self, product, bom_type, product_type):
|
||||
bom_id = self.env['mrp.bom'].create({
|
||||
'product_tmpl_id': product.product_tmpl_id.id,
|
||||
@@ -615,16 +779,18 @@ class ResMrpBomMo(models.Model):
|
||||
# 坯料BOM组件：选取当前坯料原材料，
|
||||
# 然后根据当前的坯料的体积得出需要的原材料重量（立方米m³） *材料密度 * 1000 = 所需原材料重量KG（公斤）
|
||||
# 坯料所需原材料公式：当前的坯料的体积（立方米m³） *材料密度 * 1000 = 所需原材料重量KG（公斤）
|
||||
|
||||
def bom_create_line(self, embryo):
|
||||
# 选取当前坯料原材料
|
||||
raw_bom_line = self.get_raw_bom(embryo)
|
||||
if raw_bom_line:
|
||||
qty = 1
|
||||
if round(embryo.volume * raw_bom_line.materials_type_id.density / 1000000) > 1:
|
||||
qty = round(embryo.volume * raw_bom_line.materials_type_id.density / 1000000)
|
||||
bom_line = self.env['mrp.bom.line'].create({
|
||||
'bom_id': self.id,
|
||||
'product_id': raw_bom_line.id,
|
||||
'product_tmpl_id': raw_bom_line.product_tmpl_id.id,
|
||||
'product_qty': round(embryo.volume * raw_bom_line.materials_type_id.density / 1000000),
|
||||
'product_qty': qty,
|
||||
'product_uom_id': raw_bom_line.uom_id.id,
|
||||
})
|
||||
return bom_line
|
||||
@@ -659,8 +825,7 @@ class ResMrpBomMo(models.Model):
|
||||
else:
|
||||
return
|
||||
|
||||
# 查bom的原材料
|
||||
|
||||
# 查bom的原材料
|
||||
def get_raw_bom(self, product):
|
||||
raw_bom = self.env['product.product'].search(
|
||||
[('categ_id.type', '=', '原材料'), ('materials_type_id', '=', product.materials_type_id.id)])
|
||||
|
||||
@@ -7,7 +7,7 @@ from odoo.exceptions import ValidationError, UserError
|
||||
import requests
|
||||
import json
|
||||
from re import findall as regex_findall
|
||||
from datetime import datetime
|
||||
from datetime import datetime, timedelta
|
||||
from re import split as regex_split
|
||||
from odoo import SUPERUSER_ID, _, api, fields, models
|
||||
from odoo.tools import float_compare
|
||||
@@ -154,6 +154,7 @@ class StockRule(models.Model):
|
||||
'''创建制造订单'''
|
||||
productions = self.env['mrp.production'].with_user(SUPERUSER_ID).sudo().with_company(company_id).create(
|
||||
productions_values)
|
||||
|
||||
self.env['stock.move'].sudo().create(productions._get_moves_raw_values())
|
||||
self.env['stock.move'].sudo().create(productions._get_moves_finished_values())
|
||||
'''
|
||||
@@ -188,6 +189,28 @@ class StockRule(models.Model):
|
||||
'mail.message_origin_link',
|
||||
values={'self': production, 'origin': origin_production},
|
||||
subtype_id=self.env.ref('mail.mt_note').id)
|
||||
'''
|
||||
创建生产计划
|
||||
'''
|
||||
# 工单耗时
|
||||
workorder_duration = 0
|
||||
for workorder in production.workorder_ids:
|
||||
workorder_duration += workorder.duration_expected
|
||||
|
||||
sale_order = self.env['sale.order'].sudo().search([('name', '=', production.origin)])
|
||||
if sale_order:
|
||||
bb = sale_order.deadline_of_delivery
|
||||
productions = self.env['sf.production.plan'].with_user(SUPERUSER_ID).sudo().with_company(company_id). \
|
||||
create({
|
||||
'name': production.name,
|
||||
'production_id': production.id,
|
||||
'date_planned_start': production.date_planned_start,
|
||||
'origin': production.origin,
|
||||
'product_qty': production.product_qty,
|
||||
'product_id': production.product_id.id,
|
||||
'state': 'draft',
|
||||
})
|
||||
|
||||
return True
|
||||
|
||||
|
||||
@@ -425,6 +448,7 @@ class ReStockMove(models.Model):
|
||||
'tool_height': item.product_id.tool_height,
|
||||
'tool_thickness': item.product_id.tool_thickness,
|
||||
'tool_weight': item.product_id.tool_weight,
|
||||
'tool_hardness': item.product_id.tool_hardness,
|
||||
'coating_material': item.product_id.coating_material,
|
||||
'amount': int(item.quantity_done),
|
||||
# 'model_file': '' if not item.product_id.fixture_model_file else base64.b64encode(
|
||||
@@ -433,8 +457,19 @@ class ReStockMove(models.Model):
|
||||
'total_length': item.product_id.cutting_tool_total_length,
|
||||
'shank_length': item.product_id.cutting_tool_shank_length,
|
||||
'blade_length': item.product_id.cutting_tool_blade_length,
|
||||
'neck_length': item.product_id.cutting_tool_neck_length,
|
||||
'neck_diameter': item.product_id.cutting_tool_neck_diameter,
|
||||
'shank_diameter': item.product_id.cutting_tool_shank_diameter,
|
||||
'blade_tip_diameter': item.product_id.cutting_tool_blade_tip_diameter,
|
||||
'blade_tip_taper': item.product_id.cutting_tool_blade_tip_taper,
|
||||
'blade_helix_angle': item.product_id.cutting_tool_blade_helix_angle,
|
||||
'blade_type': item.product_id.cutting_tool_blade_type,
|
||||
'coarse_medium_fine': '' if item.product_id.cutting_tool_coarse_medium_fine is False else item.product_id.cutting_tool_coarse_medium_fine,
|
||||
'run_out_accuracy_max': item.product_id.cutting_tool_run_out_accuracy_max,
|
||||
'run_out_accuracy_min': item.product_id.cutting_tool_run_out_accuracy_min,
|
||||
'head_diameter': item.product_id.cutting_tool_head_diameter,
|
||||
'diameter': item.product_id.cutting_tool_diameter,
|
||||
'blade_number': item.product_id.cutting_tool_blade_number,
|
||||
'blade_number': '' if item.product_id.cutting_tool_blade_number is False else item.product_id.cutting_tool_blade_number,
|
||||
'front_angle': item.product_id.cutting_tool_front_angle,
|
||||
'rear_angle': item.product_id.cutting_tool_rear_angle,
|
||||
'main_included_angle': item.product_id.cutting_tool_main_included_angle,
|
||||
@@ -449,14 +484,36 @@ class ReStockMove(models.Model):
|
||||
'working_hardness': item.product_id.cutting_tool_working_hardness,
|
||||
'blade_diameter': item.product_id.cutting_tool_blade_diameter,
|
||||
'wrench': item.product_id.cutting_tool_wrench,
|
||||
'screw': item.product_id.cutting_tool_screw,
|
||||
'accuracy_level': item.product_id.cutting_tool_accuracy_level,
|
||||
'clamping_way': item.product_id.cutting_tool_clamping_way,
|
||||
'clamping_length': item.product_id.cutting_tool_clamping_length,
|
||||
'clamping_tolerance': item.product_id.cutting_tool_clamping_tolerance,
|
||||
'diameter_max': item.product_id.cutting_tool_diameter_max,
|
||||
'clamping_diameter': item.product_id.cutting_tool_clamping_diameter,
|
||||
'clamping_diameter_min': item.product_id.cutting_tool_clamping_diameter_min,
|
||||
'clamping_diameter_max': item.product_id.cutting_tool_clamping_diameter_max,
|
||||
'detection_accuracy_max': item.product_id.cutting_tool_detection_accuracy_max,
|
||||
'detection_accuracy_min': item.product_id.cutting_tool_detection_accuracy_min,
|
||||
'is_rough_finish': item.product_id.cutting_tool_is_rough_finish,
|
||||
'is_finish': item.product_id.cutting_tool_is_finish,
|
||||
'is_drill_hole': item.product_id.cutting_tool_is_drill_hole,
|
||||
'is_safety_lock': item.product_id.cutting_tool_is_safety_lock,
|
||||
'is_high_speed_cutting': item.product_id.cutting_tool_is_high_speed_cutting,
|
||||
'dynamic_balance_class': item.product_id.cutting_tool_dynamic_balance_class,
|
||||
'change_time': item.product_id.cutting_tool_change_time,
|
||||
'standard_speed': item.product_id.cutting_tool_standard_speed,
|
||||
'speed_max': item.product_id.cutting_tool_speed_max,
|
||||
'cooling_type': item.product_id.cutting_tool_cooling_type,
|
||||
'body_accuracy': item.product_id.cutting_tool_body_accuracy,
|
||||
'apply_lock_nut_model': item.product_id.apply_lock_nut_model,
|
||||
'apply_lock_wrench_model': item.product_id.apply_lock_wrench_model,
|
||||
'tool_taper': item.product_id.cutting_tool_taper,
|
||||
'flange_length': item.product_id.cutting_tool_flange_length,
|
||||
'flange_diameter': item.product_id.cutting_tool_flange_diameter,
|
||||
'outer_diameter': item.product_id.cutting_tool_outer_diameter,
|
||||
'inner_diameter': item.product_id.cutting_tool_inner_diameter,
|
||||
'cooling_suit_type_ids': item.product_id.cooling_suit_type_ids,
|
||||
'er_size_model': item.product_id.cutting_tool_er_size_model,
|
||||
'image': '' if not item.product_id.image_1920 else base64.b64encode(item.product_id.image_1920).decode('utf-8'),
|
||||
}
|
||||
try:
|
||||
if item.product_id.industry_code:
|
||||
@@ -489,5 +546,3 @@ class ReStockQuant(models.Model):
|
||||
elif self.product_id.categ_type == '刀具':
|
||||
stock._register_cutting_tool()
|
||||
return True
|
||||
|
||||
|
||||
|
||||
94
sf_manufacturing/models/tool_other_features.py
Normal file
94
sf_manufacturing/models/tool_other_features.py
Normal file
@@ -0,0 +1,94 @@
|
||||
from odoo import fields, models, api
|
||||
|
||||
|
||||
class SuitableMachiningMethod(models.Model):
|
||||
_name = 'sf.suitable.machining.method'
|
||||
_description = '适合加工方式'
|
||||
|
||||
name = fields.Char('名称')
|
||||
image = fields.Image('图片')
|
||||
|
||||
|
||||
class BladeTipCharacteristics(models.Model):
|
||||
_name = 'sf.blade.tip.characteristics'
|
||||
_description = '刀尖特征'
|
||||
|
||||
name = fields.Char('名称')
|
||||
image = fields.Image('图片')
|
||||
|
||||
|
||||
class HandleType(models.Model):
|
||||
_name = 'sf.handle.type'
|
||||
_description = '柄部类型'
|
||||
|
||||
name = fields.Char('名称')
|
||||
image = fields.Image('图片')
|
||||
|
||||
|
||||
class CuttingDirection(models.Model):
|
||||
_name = 'sf.cutting.direction'
|
||||
_description = '走刀方向'
|
||||
|
||||
name = fields.Char('名称')
|
||||
image = fields.Image('图片')
|
||||
|
||||
|
||||
class SuitableCoolant(models.Model):
|
||||
_name = 'sf.suitable.coolant'
|
||||
_description = '适合冷却液'
|
||||
|
||||
name = fields.Char('名称')
|
||||
image = fields.Image('图片')
|
||||
|
||||
|
||||
class CuttingSpeed(models.Model):
|
||||
_name = 'sf.cutting.speed'
|
||||
_description = '切削速度Vc'
|
||||
|
||||
# def _get_order(self):
|
||||
# last_tool = self.search([], order='id desc', limit=1)
|
||||
# if last_tool:
|
||||
# last_order = int(last_tool.order)
|
||||
# new_order = last_order + 1
|
||||
# else:
|
||||
# new_order = '1'
|
||||
# return new_order
|
||||
#
|
||||
# order = fields.Char('序', default=_get_order, readonly=True)
|
||||
|
||||
product_template_id = fields.Many2one('product.template', string='产品')
|
||||
|
||||
execution_standard_id = fields.Char('执行标准')
|
||||
material_code = fields.Char('材料代号')
|
||||
material_name = fields.Char('材料名称')
|
||||
material_grade = fields.Char('材料牌号')
|
||||
tensile_strength = fields.Float('拉伸强度 (N/mm²)')
|
||||
hardness = fields.Float('硬度(HRC)')
|
||||
|
||||
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)')
|
||||
application = fields.Selection([('主应用', '主应用'), ('次应用', '次应用')], '主/次应用')
|
||||
|
||||
|
||||
class FeedPerTooth(models.Model):
|
||||
_name = 'sf.feed.per.tooth'
|
||||
_description = '每齿走刀量fz'
|
||||
|
||||
product_template_id = fields.Many2one('product.template', string='产品')
|
||||
|
||||
cutting_speed = fields.Char('径向切宽 ae(mm)')
|
||||
machining_method = fields.Selection([('直铣', '直铣'), ('坡铣', '坡铣')], string='加工方式')
|
||||
materials_type_id = fields.Many2one('sf.materials.model', string='材料型号')
|
||||
blade_diameter = fields.Float('刃部直径D1(mm)', readonly=True, compute='_compute_product_template_id')
|
||||
feed_per_tooth = fields.Char('每齿走刀量 (mm/z)')
|
||||
unit = fields.Char('单位', default='fz')
|
||||
|
||||
@api.depends('product_template_id')
|
||||
def _compute_product_template_id(self):
|
||||
if self.product_template_id is not None:
|
||||
self.blade_diameter = self.product_template_id.cutting_tool_blade_diameter
|
||||
Reference in New Issue
Block a user