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

1、将和刀具相关的模型的刀具直径字段类型从int改为float；2、标准刀库tree视图添加Rfid字段；优化从中控获取标准刀库信息接口；

Browse Source
This commit is contained in:
yuxianghui
2024-05-16 14:04:35 +08:00
parent 37cf4ca435
commit 20ecd9d949
6 changed files with 39 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
sf_tool_management/models/maintenance_equipment.py
View File

@@ -13,9 +13,10 @@ class SfMaintenanceEquipmentTool(models.Model):
image = fields.Binary('图片', related='functional_tool_name_id.image')
tool_code = fields.Char('功能刀具编码', related='functional_tool_name_id.code')
rfid = fields.Char('Rfid', related='functional_tool_name_id.rfid')
functional_tool_type = fields.Char('功能刀具类型', related='functional_tool_name_id.sf_cutting_tool_type_id.name')
tool_groups = fields.Char('刀具组', related='functional_tool_name_id.tool_groups_id.name')
diameter = fields.Integer('直径(mm)', related='functional_tool_name_id.functional_tool_diameter')
diameter = fields.Float('直径(mm)', related='functional_tool_name_id.functional_tool_diameter')
knife_tip_r_angle = fields.Float('刀尖R角(mm)', related='functional_tool_name_id.knife_tip_r_angle')
life_value_max = fields.Integer('最大寿命值(min)', related='functional_tool_name_id.max_lifetime_value')
alarm_value = fields.Integer('报警值(min)', related='functional_tool_name_id.alarm_value')
@@ -26,15 +27,15 @@ class SfMaintenanceEquipmentTool(models.Model):
# if datas:
# print(datas)
@api.model_create_multi
def create(self, vals_list):
tools = super().create(vals_list)
for tool in tools:
self.env['sf.machine.table.tool.changing.apply'].sudo().create({
'maintenance_equipment_id': tool.equipment_id.id,
'cutter_spacing_code_id': tool.id
})
return tools
# @api.model_create_multi
# def create(self, vals_list):
# tools = super().create(vals_list)
# for tool in tools:
# self.env['sf.machine.table.tool.changing.apply'].sudo().create({
# 'maintenance_equipment_id': tool.equipment_id.id,
# 'cutter_spacing_code_id': tool.id
# })
# return tools
class SfMaintenanceEquipment(models.Model):
@@ -68,6 +69,18 @@ class SfMaintenanceEquipment(models.Model):
[('equipment_id', '=', maintenance_equipment_id.id), ('code', '=', tool_id)])
functional_tool_id = self.env['sf.functional.cutting.tool.entity'].sudo().search(
[('rfid', '=', data['RfidCode'])])
if functional_tool_id:
# 查询该功能刀具是否已经装在机床内其他位置，如果是就删除
equipment_tools = self.env['maintenance.equipment.tool'].sudo().search(
[('functional_tool_name_id', '=', functional_tool_id.id), ('code', '!=', tool_id)])
if equipment_tools:
for item in equipment_tools:
item.write({
'functional_tool_name_id': False,
'tool_install_time': None
})
else:
logging.info('Rfid为【%s】的功能刀具不存在！' % data['RfidCode'])
time = None
if data['AddDatetime']:
datatime = str(data['AddDatetime'])