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

Accept Merge Request #2004: (feature/功能刀具拆解单优化_1 -> develop)

Browse Source 
Merge Request: Merge branch 'feature/功能刀具拆解单优化' into feature/功能刀具拆解单优化_1

Created By: @禹翔辉
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2004
This commit is contained in:
禹翔辉
2025-04-15 17:22:50 +08:00
committed by Coding
parent 722b601890 b9aac6c558
commit 06e9d5a538
3 changed files with 33 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
sf_tool_management/models/functional_tool.py
View File

@@ -63,16 +63,27 @@ class FunctionalCuttingToolEntity(models.Model):
for item in self: for item in self:
if item: if item:
if item.functional_tool_status == '报警': if item.functional_tool_status == '报警':
# 创建报警刀具拆解单 self.create_tool_dismantle()
self.env['sf.functional.tool.dismantle'].sudo().create({
'functional_tool_id': item.ids[0], def set_functional_tool_status(self):
'dismantle_cause': '寿命到期报废' # self.write({
}) # 'functional_tool_status': '报警'
# 创建刀具报警记录 # })
self.env['sf.functional.tool.warning'].sudo().create({ self.functional_tool_status = '报警'
'rfid': item.rfid, self.create_tool_dismantle()
'functional_tool_id': item.ids[0]
}) def create_tool_dismantle(self):
for item in self:
# 创建报警刀具拆解单
self.env['sf.functional.tool.dismantle'].sudo().create({
'functional_tool_id': item.ids[0],
'dismantle_cause': '寿命到期报废'
})
# 创建刀具报警记录
self.env['sf.functional.tool.warning'].sudo().create({
'rfid': item.rfid,
'functional_tool_id': item.ids[0]
})
@api.depends('barcode_id.quant_ids', 'barcode_id.quant_ids.location_id', 'functional_tool_status', @api.depends('barcode_id.quant_ids', 'barcode_id.quant_ids.location_id', 'functional_tool_status',
'current_shelf_location_id', 'stock_num') 'current_shelf_location_id', 'stock_num')

16
sf_tool_management/models/maintenance_equipment.py
View File

@@ -107,11 +107,17 @@ class SfMaintenanceEquipment(models.Model):
if functional_tool_id.current_location != '机内刀库': if functional_tool_id.current_location != '机内刀库':
# 对功能刀具进行移动到生产线 # 对功能刀具进行移动到生产线
functional_tool_id.tool_inventory_displacement_out() functional_tool_id.tool_inventory_displacement_out()
functional_tool_id.write({ data_tool = {
'max_lifetime_value': data['MaxLife'], 'max_lifetime_value': data['MaxLife'],
'used_value': data['UseLife'], 'used_value': data['UseLife'],
'functional_tool_status': tool_install_time.get(data['State']) 'functional_tool_status': tool_install_time.get(data['State'])
}) }
if (functional_tool_id.functional_tool_status != '报警'
and tool_install_time.get(data['State']) == '报警'):
functional_tool_id.write(data_tool)
functional_tool_id.create_tool_dismantle()
else:
functional_tool_id.write(data_tool)
else: else:
logging.info('获取的【%s】设备不存在！！！' % data['DeviceId']) logging.info('获取的【%s】设备不存在！！！' % data['DeviceId'])
else: else:

1
sf_tool_management/views/functional_tool_views.xml
View File

@@ -42,6 +42,7 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form create="0" edit="0" delete="0"> <form create="0" edit="0" delete="0">
<header> <header>
<button name="set_functional_tool_status" string="报警" type="object" invisible="1"/>
<!-- <button name="enroll_functional_tool_entity" string="功能刀具注册" type="object"--> <!-- <button name="enroll_functional_tool_entity" string="功能刀具注册" type="object"-->
<!-- class="btn-primary"/>--> <!-- class="btn-primary"/>-->
<field name="functional_tool_status" widget="statusbar" statusbar_visible="正常,报警,已拆除"/> <field name="functional_tool_status" widget="statusbar" statusbar_visible="正常,报警,已拆除"/>