From 3c3f37512028ce4dce3251a8a133e78181b94306 Mon Sep 17 00:00:00 2001 From: yuxianghui <3437689193@qq.com> Date: Thu, 23 May 2024 15:19:41 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=89=93=E5=BC=80=E7=BB=84=E8=A3=85?= =?UTF-8?q?=E5=BC=B9=E7=AA=97=E6=96=B9=E6=B3=95=E6=B7=BB=E5=8A=A0=E6=B8=85?= =?UTF-8?q?=E9=99=A4=E6=97=A7=E6=95=B0=E6=8D=AE=E5=8A=9F=E8=83=BD=EF=BC=9B?= =?UTF-8?q?2=E3=80=81=E7=BB=84=E8=A3=85=E5=BC=B9=E7=AA=97=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E5=88=B7=E6=96=B0=E6=8C=89=E9=94=AE=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E6=94=B9=E4=B8=BA=E8=8E=B7=E5=8F=96=E6=B5=8B=E9=87=8F?= =?UTF-8?q?=E5=80=BC=EF=BC=8C=E6=B7=BB=E5=8A=A0=E6=98=AF=E5=90=A6=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E6=B5=8B=E9=87=8F=E5=80=BC=E5=AD=97=E6=AE=B5=E7=AD=89?= =?UTF-8?q?=EF=BC=8C=E8=B0=83=E6=95=B4=E5=AD=97=E6=AE=B5=E5=8F=AA=E8=AF=BB?= =?UTF-8?q?=E5=92=8C=E7=95=8C=E9=9D=A2=E5=B8=83=E5=B1=80=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_tool_management/models/base.py | 7 ++++++- sf_tool_management/wizard/wizard.py | 15 +++++++++++---- sf_tool_management/wizard/wizard_view.xml | 21 ++++++++++++--------- 3 files changed, 29 insertions(+), 14 deletions(-) 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 @@ -