1、打开组装弹窗方法添加清除旧数据功能;2、组装弹窗界面,刷新按键名称改为获取测量值,添加是否获取测量值字段等,调整字段只读和界面布局;
This commit is contained in:
@@ -486,6 +486,8 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
|
||||
hiding_length = fields.Float(string='避空长(mm)')
|
||||
after_tool_groups_id = fields.Many2one('sf.tool.groups', string='组装后刀具组')
|
||||
|
||||
obtain_measurement_status = fields.Boolean('是否获取测量值', default=False)
|
||||
|
||||
@api.depends('after_assembly_tool_loading_length', 'after_assembly_handle_length')
|
||||
def _compute_after_assembly_functional_tool_length(self):
|
||||
for item in self:
|
||||
@@ -502,11 +504,16 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
|
||||
获取刀具预调仪数据
|
||||
"""
|
||||
tool = self.env['sf.functional.tool.assembly'].search([('assembly_order_code', '=', self.assembly_order_code)])
|
||||
|
||||
tool_loading_length = tool.after_assembly_tool_loading_length
|
||||
diameter = tool.after_assembly_functional_tool_diameter
|
||||
r_angle = tool.after_assembly_knife_tip_r_angle
|
||||
if tool_loading_length == 0 and diameter == 0 and r_angle == 0:
|
||||
raise ValidationError('没有获取到测量数据!')
|
||||
self.write({
|
||||
'after_assembly_tool_loading_length': tool.after_assembly_tool_loading_length, # 总长度
|
||||
'after_assembly_functional_tool_diameter': tool.after_assembly_functional_tool_diameter, # 直径
|
||||
'after_assembly_knife_tip_r_angle': tool.after_assembly_knife_tip_r_angle # R角
|
||||
'after_assembly_tool_loading_length': tool_loading_length, # 总长度
|
||||
'after_assembly_functional_tool_diameter': diameter, # 直径
|
||||
'after_assembly_knife_tip_r_angle': r_angle, # R角
|
||||
'obtain_measurement_status': True # 是否获取测量值
|
||||
})
|
||||
|
||||
return {
|
||||
|
||||
Reference in New Issue
Block a user