diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py
index 5291d4d7..e840224f 100644
--- a/sf_tool_management/models/base.py
+++ b/sf_tool_management/models/base.py
@@ -578,7 +578,12 @@ class FunctionalToolAssembly(models.Model):
def put_start_preset(self):
self.search([('start_preset_bool', '=', True)]).write({'start_preset_bool': False})
- self.write({'start_preset_bool': True})
+ self.write({
+ 'after_assembly_tool_loading_length': 0,
+ 'after_assembly_functional_tool_diameter': 0,
+ 'after_assembly_knife_tip_r_angle': 0,
+ 'start_preset_bool': True
+ })
return {
'type': 'ir.actions.act_window',
'res_model': 'sf.functional.tool.assembly.order',
diff --git a/sf_tool_management/wizard/wizard.py b/sf_tool_management/wizard/wizard.py
index 131b9e43..a6f156d7 100644
--- a/sf_tool_management/wizard/wizard.py
+++ b/sf_tool_management/wizard/wizard.py
@@ -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 {
diff --git a/sf_tool_management/wizard/wizard_view.xml b/sf_tool_management/wizard/wizard_view.xml
index 85613f56..955bb998 100644
--- a/sf_tool_management/wizard/wizard_view.xml
+++ b/sf_tool_management/wizard/wizard_view.xml
@@ -341,18 +341,20 @@
-
+
+
-
-
-
@@ -366,19 +368,19 @@
+ class="custom_required" readonly="1"/>
+ class="custom_required" readonly="1"/>
+ class="custom_required" readonly="1"/>
+ class="custom_required"/>
+ class="custom_required"/>
@@ -390,6 +392,7 @@