From 75f30922e6d15a356c8204dd29cf57f809932337 Mon Sep 17 00:00:00 2001 From: yuxianghui <3437689193@qq.com> Date: Thu, 23 May 2024 14:32:13 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E7=BB=84=E8=A3=85=E5=8D=95=E5=BC=B9?= =?UTF-8?q?=E7=AA=97=E7=95=8C=E9=9D=A2=E8=B0=83=E6=95=B4=EF=BC=8C=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E6=8C=89=E5=88=B7=E6=96=B0=E5=90=8E=E6=9C=80=E5=A4=A7?= =?UTF-8?q?=E5=AF=BF=E5=91=BD=E5=80=BC=E5=BD=920=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_tool_management/wizard/wizard.py | 28 +++++++++++++++-------- sf_tool_management/wizard/wizard_view.xml | 13 +++++++---- 2 files changed, 27 insertions(+), 14 deletions(-) diff --git a/sf_tool_management/wizard/wizard.py b/sf_tool_management/wizard/wizard.py index 70cae0f5..131b9e43 100644 --- a/sf_tool_management/wizard/wizard.py +++ b/sf_tool_management/wizard/wizard.py @@ -473,7 +473,8 @@ class FunctionalToolAssemblyOrder(models.TransientModel): after_assembly_whether_standard_knife = fields.Boolean(string='组装后是否标准刀', default=True) after_assembly_coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], string='组装后粗/中/精', default='3') - after_assembly_max_lifetime_value = fields.Integer(string='组装后最大寿命值(min)', readonly=True) + after_assembly_max_lifetime_value = fields.Integer(string='组装后最大寿命值(min)', store=True, + compute='_compute_after_assembly_max_lifetime_value') after_assembly_alarm_value = fields.Integer(string='组装后报警值(min)') after_assembly_used_value = fields.Integer(string='组装后已使用值(min)') after_assembly_tool_loading_length = fields.Float(string='组装后总长度(mm)', digits=(10, 3)) @@ -517,20 +518,25 @@ class FunctionalToolAssemblyOrder(models.TransientModel): 'flags': {'form': {'action_buttons': True, 'options': {'mode': 'modal'}}} } + @api.depends('after_name_id') + def _compute_after_assembly_max_lifetime_value(self): + for item in self: + if item.after_name_id: + item.after_assembly_max_lifetime_value = item.after_name_id.life_span + @api.onchange('after_name_id') def _onchange_number(self): for item in self: if item.after_name_id: item.after_assembly_functional_tool_diameter = item.after_name_id.diameter item.after_assembly_knife_tip_r_angle = item.after_name_id.angle - item.after_assembly_max_lifetime_value = item.after_name_id.life_span item.after_assembly_tool_loading_length = item.after_name_id.tool_length item.after_assembly_functional_tool_length = item.after_name_id.extension item.hiding_length = item.after_name_id.blade_length item.after_assembly_functional_tool_type_id = item.after_name_id.functional_cutting_tool_model_id.id item.after_tool_groups_id = item.after_name_id.tool_groups_id.id else: - item.after_assembly_functional_tool_type_id = item.functional_tool_type_id + item.after_assembly_functional_tool_type_id = item.functional_tool_type_id.id item.after_tool_groups_id = item.tool_groups_id.id # functional_tool_cutting_type = fields.Char(string='功能刀具切削类型', readonly=False) @@ -686,22 +692,24 @@ class FunctionalToolAssemblyOrder(models.TransientModel): if not self.bar_product_id and not self.pad_product_id: raise ValidationError('【刀盘】和【刀杆】必须填写一个！') # 组装参数必填校验 - if self.after_assembly_tool_loading_length == 0: - raise ValidationError('组装参数信息【总长度】不能为0！！！') if self.after_assembly_functional_tool_length == 0: - raise ValidationError('组装参数信息【伸出长】不能为0！！！') + raise ValidationError('组装参数信息【伸出长】不能为0！') if self.after_assembly_max_lifetime_value == 0: - raise ValidationError('组装参数信息【最大寿命值】不能为0！！！') + raise ValidationError('组装参数信息【最大寿命值】不能为0！') if self.after_assembly_alarm_value == 0: - raise ValidationError('组装参数信息【报警值】不能为0！！！') + raise ValidationError('组装参数信息【报警值】不能为0！') # if self.after_assembly_effective_length == 0: # raise ValidationError('组装参数信息【有效长】不能为0！！！') # if self.hiding_length == 0: # raise ValidationError('组装参数信息【避空长】不能为0！！！') if self.after_assembly_functional_tool_diameter == 0: - raise ValidationError('组装参数信息【刀具直径】不能为0！！！') + raise ValidationError('组装参数信息【刀具直径】不能为0！') + if self.after_assembly_tool_loading_length == 0: + raise ValidationError('组装参数信息【总长度】不能为0！！！') if self.after_assembly_handle_length == 0: - raise ValidationError('组装参数信息【刀柄长度】不能为0！！！') + raise ValidationError('组装参数信息【刀柄长度】不能为0！') + if self.after_assembly_tool_loading_length < self.after_assembly_handle_length: + raise ValidationError('组装参数信息【刀柄长度】不能大于【总长度】！') def get_desc_1(self, stock_lot): return { diff --git a/sf_tool_management/wizard/wizard_view.xml b/sf_tool_management/wizard/wizard_view.xml index 8045f394..85613f56 100644 --- a/sf_tool_management/wizard/wizard_view.xml +++ b/sf_tool_management/wizard/wizard_view.xml @@ -166,11 +166,12 @@

- +

+ @@ -333,14 +334,18 @@ -
-
+ + +