jikimo/jikimo_sf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1、优化刀具预调仪接口的数据处理方式、更改搜索组装单条件；2、优化功能刀具、组装单、组装单弹窗的字段和界面展示的字段内容；3、更改组装单编码生成规则

Browse Source
This commit is contained in:
yuxianghui
2024-05-23 11:15:13 +08:00
parent 8d02a94f78
commit 66b4df5193
9 changed files with 166 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
sf_tool_management/wizard/wizard.py
View File

@@ -473,16 +473,29 @@ 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)')
after_assembly_max_lifetime_value = fields.Integer(string='组装后最大寿命值(min)', readonly=True)
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))
after_assembly_functional_tool_length = fields.Float(string='组装后伸出长(mm)', required=True)
after_assembly_handle_length = fields.Float(string='组装后刀柄长度(mm)', digits=(10, 3))
after_assembly_functional_tool_length = fields.Float(string='组装后伸出长(mm)', digits=(10, 3),
compute='_compute_after_assembly_functional_tool_length')
after_assembly_effective_length = fields.Float(string='组装后有效长(mm)')
L_D_number = fields.Float(string='L/D值(mm)', compute='_compute_l_d_number')
hiding_length = fields.Float(string='避空长(mm)')
after_tool_groups_id = fields.Many2one('sf.tool.groups', string='组装后刀具组')
@api.depends('after_assembly_tool_loading_length', 'after_assembly_handle_length')
def _compute_after_assembly_functional_tool_length(self):
for item in self:
item.after_assembly_functional_tool_length = item.after_assembly_tool_loading_length - item.after_assembly_handle_length
@api.onchange('after_assembly_max_lifetime_value')
def _onchange_after_assembly_alarm_value(self):
for item in self:
if item.after_assembly_max_lifetime_value:
item.after_assembly_alarm_value = item.after_assembly_max_lifetime_value * 0.95
def get_tool_preset_parameter(self):
"""
获取刀具预调仪数据
@@ -681,12 +694,14 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
raise ValidationError('组装参数信息【最大寿命值】不能为0！！！')
if self.after_assembly_alarm_value == 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 and self.after_assembly_knife_tip_r_angle == 0:
raise ValidationError('组装参数信息【刀具直径】和【刀具R角】必须有一个不能为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！！！')
if self.after_assembly_handle_length == 0:
raise ValidationError('组装参数信息【刀柄长度】不能为0！！！')
def get_desc_1(self, stock_lot):
return {
@@ -716,6 +731,7 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
'after_assembly_alarm_value': self.after_assembly_alarm_value,
'after_assembly_used_value': self.after_assembly_used_value,
'after_assembly_tool_loading_length': self.after_assembly_tool_loading_length,
'after_assembly_handle_length': self.after_assembly_handle_length,
'after_assembly_functional_tool_length': self.after_assembly_functional_tool_length,
'after_assembly_effective_length': self.after_assembly_effective_length,
'L_D_number': self.L_D_number,
@@ -748,6 +764,7 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
'coarse_middle_thin': self.after_assembly_coarse_middle_thin,
'new_former': self.after_assembly_new_former,
'tool_loading_length': self.after_assembly_tool_loading_length,
'handle_length': self.after_assembly_handle_length,
'functional_tool_length': self.after_assembly_functional_tool_length,
'effective_length': self.after_assembly_effective_length,